summaryrefslogtreecommitdiffstats
path: root/include/Kbuild
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-05-20 17:55:50 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2010-05-20 17:55:50 +0200
commit96b5b7f4f2d59b37c1fc2fba1ae25999accd6dcd (patch)
treecda421c6cd7533940b35504660a05a366a3ece0c /include/Kbuild
parentMerge branch 'for-2.6.35' of git://linux-nfs.org/~bfields/linux (diff)
parentMerge branch 'next' into for-linus (diff)
downloadlinux-96b5b7f4f2d59b37c1fc2fba1ae25999accd6dcd.tar.xz
linux-96b5b7f4f2d59b37c1fc2fba1ae25999accd6dcd.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: (61 commits) KEYS: Return more accurate error codes LSM: Add __init to fixup function. TOMOYO: Add pathname grouping support. ima: remove ACPI dependency TPM: ACPI/PNP dependency removal security/selinux/ss: Use kstrdup TOMOYO: Use stack memory for pending entry. Revert "ima: remove ACPI dependency" Revert "TPM: ACPI/PNP dependency removal" KEYS: Do preallocation for __key_link() TOMOYO: Use mutex_lock_interruptible. KEYS: Better handling of errors from construct_alloc_key() KEYS: keyring_serialise_link_sem is only needed for keyring->keyring links TOMOYO: Use GFP_NOFS rather than GFP_KERNEL. ima: remove ACPI dependency TPM: ACPI/PNP dependency removal selinux: generalize disabling of execmem for plt-in-heap archs LSM Audit: rename LSM_AUDIT_NO_AUDIT to LSM_AUDIT_DATA_NONE CRED: Holding a spinlock does not imply the holding of RCU read lock SMACK: Don't #include Ext2 headers ...
Diffstat (limited to 'include/Kbuild')
0 files changed, 0 insertions, 0 deletions