summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/osst_options.h
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2011-09-20 05:51:04 +0200
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2011-09-20 07:52:38 +0200
commit1cce058b29e7eb8a71a72d8bb87eb7b4e0401c22 (patch)
tree493477b7a19606c66de2f003bca83672f2164cad /drivers/scsi/osst_options.h
parentpowerpc/ps3: Add gelic udbg driver (diff)
parentMerge branch 'irq-fixes-for-linus' of git://tesla.tglx.de/git/linux-2.6-tip (diff)
downloadlinux-1cce058b29e7eb8a71a72d8bb87eb7b4e0401c22.tar.xz
linux-1cce058b29e7eb8a71a72d8bb87eb7b4e0401c22.zip
Merge remote-tracking branch 'origin/master' into next
(Merge in order to get the PCIe mps/mrss code fixes)
Diffstat (limited to 'drivers/scsi/osst_options.h')
0 files changed, 0 insertions, 0 deletions