From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Tue, 20 Sep 2005 15:50:49 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6
X-Git-Tag: v2.6.14-rc3~154
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=9600c11ba3602be161cd376f1460f3de561fc299;p=linux-2.6-omap-h63xx.git

Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6
---

9600c11ba3602be161cd376f1460f3de561fc299