tree 02999d88756715d7c3cd23d4e20c6627472e69da
parent 40e38d30432a749b68d4c6e2038764ed1d3c846e
parent 1a74bc68e4c0534d150e6454b45a70dab831fa32
author Linus Torvalds <torvalds@woody.osdl.org> 1168473429 -0800
committer Linus Torvalds <torvalds@woody.osdl.org> 1168473429 -0800

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: sbp2: fix probing of some DVD-ROM/RWs