From: Linus Torvalds Date: Wed, 20 Jun 2007 22:39:50 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394... X-Git-Tag: v2.6.22-rc6~69 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=d025d7858f7415f558e89d870ad1a205954b64cd;p=~emulex%2Finfiniband.git 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 --- d025d7858f7415f558e89d870ad1a205954b64cd