Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
commit6275487806fbc17e92595b5880d7b0ee49363c4f
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 4 Mar 2008 19:37:36 +0000 (4 11:37 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 4 Mar 2008 19:37:36 +0000 (4 11:37 -0800)
tree3542672eacd8c413b20f9c47c8b65db537e251e6
parentc5750ee69f469024d98019545e41c74abf1652bd
parente97a294ef6938512b655b1abf17656cf2b26f709
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  scsi: missing add of padded bytes to io completion byte count