From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 4 Mar 2012 00:42:30 +0000 (-0800)
Subject: Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi... 
X-Git-Tag: v3.3-rc6~1
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=8482a0abe94e535bca25d22f8d46bbecbfe1f132;p=linux.git

Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6

SCSI fixes from James Bottomley:
 "There's just a single fix in here: the osd max device number fix."

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
  [SCSI] osd_uld: Bump MAX_OSD_DEVICES from 64 to 1,048,576
---

8482a0abe94e535bca25d22f8d46bbecbfe1f132