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)
commite6c9f716ba91c1e065b75949f643383d1888bed5
tree792131212ba9323283ea8541bcc440a71ae401f7
parent5fdb51a10f3ab4320c3170b79d66ce34a6e65a67
parent346f5c7ee7fa4ebee0e4c96415a7e59716bfa1d0
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