commit | d025d7858f7415f558e89d870ad1a205954b64cd | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Wed Jun 20 15:39:50 2007 -0700 |
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Wed Jun 20 15:39:50 2007 -0700 |
tree | c405da2a5ce0e8b5e6db92fa4cc9df51c3a34e77 | |
parent | b3f4256fe0682143883ce6903e4646a03943f792 [diff] | |
parent | 24315c5e6f508edd84e996d67daef3d1bcc72f8b [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 * '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