Merge SCSI tree from James Bottomley.
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 18 Apr 2005 21:25:40 +0000 (14:25 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 18 Apr 2005 21:25:40 +0000 (14:25 -0700)
Done with "git-pull-script rsync://www.parisc-linux.org/~jejb/scsi-rc-fixes-2.6.git"
together with an automated content merge.


Trivial merge