aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-06 10:48:34 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-06 10:48:34 -0800
commit8ed5de58cf4c45ff0ca97cb0d48d76f0e42faec6 (patch)
treeede6bc489b4d0cae91d730393d6c0dc654528b46 /drivers/scsi
parentMerge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev (diff)
parentSELinux: Remove security_get_policycaps() (diff)
downloadlinux-dev-8ed5de58cf4c45ff0ca97cb0d48d76f0e42faec6.tar.xz
linux-dev-8ed5de58cf4c45ff0ca97cb0d48d76f0e42faec6.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6: SELinux: Remove security_get_policycaps() security: allow Kconfig to set default mmap_min_addr protection
Diffstat (limited to 'drivers/scsi')
0 files changed, 0 insertions, 0 deletions