]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
authorLinus Torvalds <torvalds@g5.osdl.org>
Sun, 29 Oct 2006 21:34:15 +0000 (13:34 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sun, 29 Oct 2006 21:34:15 +0000 (13:34 -0800)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
  ieee1394: ohci1394: revert fail on error in suspend


Trivial merge