From: Linus Torvalds Date: Sun, 29 Oct 2006 21:34:15 +0000 (-0800) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394... X-Git-Tag: v2.6.19-rc4~26 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=e6c9f716ba91c1e065b75949f643383d1888bed5;p=~shefty%2Frdma-dev.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: ieee1394: ohci1394: revert fail on error in suspend --- e6c9f716ba91c1e065b75949f643383d1888bed5