Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6

Browse source

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
  firewire: Kconfig help update
  ieee1394: sbp2: let nodemgr retry node updates during bus reset series
  ieee1394: don't drop nodes during bus reset series
  ieee1394: regression in 2.6.25: updates should happen before probes

...

This commit is contained in:

Linus Torvalds 2008-08-19 13:56:21 -07:00

parent ddd13dc606 30b0aa7c9a

commit 395c68464c

4 changed files with 54 additions and 40 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

4

drivers/firewire/Kconfig

View file

63

drivers/ieee1394/nodemgr.c

View file

2

drivers/ieee1394/nodemgr.h

View file

25

drivers/ieee1394/sbp2.c

View file