Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6
authorLinus Torvalds <[email protected]>
Mon, 24 Oct 2005 00:13:14 +0000 (17:13 -0700)
committerLinus Torvalds <[email protected]>
Mon, 24 Oct 2005 00:13:14 +0000 (17:13 -0700)

Trivial merge