From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sat, 14 Jan 2006 20:16:07 +0000 (-0800)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
X-Git-Tag: v2.6.16-rc1~162
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12dbf3fc4d06d2c0c4c44dc0612df04248b3cfd3;p=linux-2.6

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

12dbf3fc4d06d2c0c4c44dc0612df04248b3cfd3