tree b83e5313ca07a3efbcbcdd7fe33e0f6ad6284493
parent 3610639d1fceb09cb418c65fcbe9136c31eee03a
parent ac8cc0fa5395fe2278e305a4cbed48e90d88d878
author Linus Torvalds <torvalds@linux-foundation.org> 1231290699 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1231290699 -0800

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