aboutsummaryrefslogtreecommitdiffstats
path: root/security/selinux/ss
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-03-03 09:11:02 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-03 09:11:02 -0800
commit2a32f2db132264c356aea30a8270d3e68d96c509 (patch)
treef98f0e1b9d85c7964b8fc149f451ae77072c3c27 /security/selinux/ss
parentfeaf77d51a6e2e95f60c8095ac7282e610ede798 (diff)
parentf41496607e03ab99f263b8e26689ad0fc853007f (diff)
downloadmrst-s0i3-test-2a32f2db132264c356aea30a8270d3e68d96c509.tar.gz
mrst-s0i3-test-2a32f2db132264c356aea30a8270d3e68d96c509.tar.xz
mrst-s0i3-test-2a32f2db132264c356aea30a8270d3e68d96c509.zip
Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: resource: Fix broken indentation resource: Fix generic page_is_ram() for partial RAM pages x86, paravirt: Remove kmap_atomic_pte paravirt op. x86, vmi: Disable highmem PTE allocation even when CONFIG_HIGHPTE=y x86, xen: Disable highmem PTE allocation even when CONFIG_HIGHPTE=y
Diffstat (limited to 'security/selinux/ss')
0 files changed, 0 insertions, 0 deletions