Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
authorLinus Torvalds <torvalds@woody.osdl.org>
Sat, 30 Dec 2006 19:40:40 +0000 (11:40 -0800)
committerLinus Torvalds <torvalds@woody.osdl.org>
Sat, 30 Dec 2006 19:40:40 +0000 (11:40 -0800)
commit72836708c6218d91db982ae48c5c62293e78ed7c
tree6d26d3a7a298a5a824ed9d400e66092b50c8f650
parent91f6e54b6e534edbf6208e1c750fff9e0491dfcc
parent97d552e35d9404df3254e1157df3340e4e2eaedc
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 bogus dma mapping
  ieee1394: sbp2: pass REQUEST_SENSE through to the target