From: Linus Torvalds <torvalds@g5.osdl.org>
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: upstream/snapshot3+hdmi~36434^2~7^2~8
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e6c9f716ba91c1e065b75949f643383d1888bed5;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge branch 'for-linus' of git://git./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