aboutsummaryrefslogtreecommitdiffstats
path: root/block/scsi_ioctl.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-01-26 19:39:40 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-01-26 19:39:40 -0800
commit7d620a4e531ae4d432d3c88f7d4b75327d881a87 (patch)
treefe4b226f695394383e546683755ebda9f37ac7b2 /block/scsi_ioctl.c
parent86d43258bcad2068744c85181b97bb35ab27a74d (diff)
parent095b8501e4168ae5a879fcb9420ac48cbd43f95a (diff)
downloadmrst-s0i3-test-7d620a4e531ae4d432d3c88f7d4b75327d881a87.tar.gz
mrst-s0i3-test-7d620a4e531ae4d432d3c88f7d4b75327d881a87.tar.xz
mrst-s0i3-test-7d620a4e531ae4d432d3c88f7d4b75327d881a87.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [IPV4]: Fix single-entry /proc/net/fib_trie output. [SELINUX]: Fix 2.6.20-rc6 build when no xfrm
Diffstat (limited to 'block/scsi_ioctl.c')
0 files changed, 0 insertions, 0 deletions