summaryrefslogtreecommitdiffstats
path: root/scripts/tracing
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-01-07 02:11:39 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2009-01-07 02:11:39 +0100
commitc861ea2cb2c25c1698734d9b0540a09e253690a1 (patch)
treeb83e5313ca07a3efbcbcdd7fe33e0f6ad6284493 /scripts/tracing
parentMerge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/k... (diff)
parentMerge branch 'next' into for-linus (diff)
downloadlinux-c861ea2cb2c25c1698734d9b0540a09e253690a1.tar.xz
linux-c861ea2cb2c25c1698734d9b0540a09e253690a1.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: CRED: Fix regression in cap_capable() as shown up by sys_faccessat() [ver #3] Revert "CRED: Fix regression in cap_capable() as shown up by sys_faccessat() [ver #2]" SELinux: shrink sizeof av_inhert selinux_class_perm and context CRED: Fix regression in cap_capable() as shown up by sys_faccessat() [ver #2] keys: fix sparse warning by adding __user annotation to cast smack: Add support for unlabeled network hosts and networks selinux: Deprecate and schedule the removal of the the compat_net functionality netlabel: Update kernel configuration API
Diffstat (limited to 'scripts/tracing')
0 files changed, 0 insertions, 0 deletions