diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-03 09:11:02 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-03 09:11:02 -0800 |
commit | 2a32f2db132264c356aea30a8270d3e68d96c509 (patch) | |
tree | f98f0e1b9d85c7964b8fc149f451ae77072c3c27 /security/selinux/selinuxfs.c | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2 (diff) | |
parent | resource: Fix broken indentation (diff) | |
download | linux-dev-2a32f2db132264c356aea30a8270d3e68d96c509.tar.xz linux-dev-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/selinuxfs.c')
0 files changed, 0 insertions, 0 deletions