Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6

Browse source

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
  security: Fix setting of PF_SUPERPRIV by __capable()

...

This commit is contained in:

Linus Torvalds 2008-08-15 15:32:13 -07:00

parent d121db94eb 5cd9c58fbe

commit 71ef2a46fc

11 changed files with 137 additions and 63 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

21

kernel/capability.c

View file

5

kernel/ptrace.c

View file