Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
authorLinus Torvalds <torvalds@woody.osdl.org>
Wed, 10 Jan 2007 23:57:09 +0000 (15:57 -0800)
committerLinus Torvalds <torvalds@woody.osdl.org>
Wed, 10 Jan 2007 23:57:09 +0000 (15:57 -0800)
commit2d9819e3473f3e2200a4942760fa1f3d41043b99
tree02999d88756715d7c3cd23d4e20c6627472e69da
parent40e38d30432a749b68d4c6e2038764ed1d3c846e
parent1a74bc68e4c0534d150e6454b45a70dab831fa32
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: sbp2: fix probing of some DVD-ROM/RWs