aboutsummaryrefslogtreecommitdiffstats
path: root/block/scsi_ioctl.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-01-28 12:45:22 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-01-28 12:45:22 -0800
commit5263bf65d6342e12ab716db8e529501670979321 (patch)
tree575a714f55e6b05443c182df2673392ea2865fea /block/scsi_ioctl.c
parent7d620a4e531ae4d432d3c88f7d4b75327d881a87 (diff)
parent545da94f924d52f80e2bbea99a8652f454889a2b (diff)
downloadmrst-s0i3-test-5263bf65d6342e12ab716db8e529501670979321.tar.gz
mrst-s0i3-test-5263bf65d6342e12ab716db8e529501670979321.tar.xz
mrst-s0i3-test-5263bf65d6342e12ab716db8e529501670979321.zip
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [POWERPC] Fix sys_pciconfig_iobase bus matching [POWERPC] PS3: add not complete comment to kconfig [POWERPC] ps3_free_io_irq: Fix inverted error check [POWERPC] PS3: Fix uniprocessor kernel build
Diffstat (limited to 'block/scsi_ioctl.c')
0 files changed, 0 insertions, 0 deletions