]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
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)
* '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


Trivial merge