Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 2 Feb 2008 20:51:38 +0000 (07:51 +1100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 2 Feb 2008 20:51:38 +0000 (07:51 +1100)
commit6598b60fd56ba5e915a001cc4e307880a94d19ae
tree3cf5e13b9bfdc6d953cf3f3bf374458a4855550c
parentae9458d6a0956aa21cb49e1251e35a8d4dacbe6e
parent5fcf500058d5f06720302c5ce138c7bca93f7655
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 s/g access change