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: Only set client->iso_context if allocation was successful.
  ieee1394: fix to ether1394_tx in ether1394.c
  firewire: fix hang after card ejection

...

This commit is contained in:

Linus Torvalds 2007-06-20 15:39:50 -07:00

parent b3f4256fe0 24315c5e6f

commit d025d7858f

3 changed files with 27 additions and 15 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

19

drivers/firewire/fw-cdev.c

View file

2

drivers/firewire/fw-ohci.c

View file

21

drivers/ieee1394/eth1394.c

View file