aboutsummaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-06-20 15:39:50 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-06-20 15:39:50 -0700
commitd025d7858f7415f558e89d870ad1a205954b64cd (patch)
treec405da2a5ce0e8b5e6db92fa4cc9df51c3a34e77 /drivers/net
parentb3f4256fe0682143883ce6903e4646a03943f792 (diff)
parent24315c5e6f508edd84e996d67daef3d1bcc72f8b (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
Diffstat (limited to 'drivers/net')
0 files changed, 0 insertions, 0 deletions