| commit | 71ef2a46fce43042a60d7ccbf55ecbd789c03c2e | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Aug 15 15:32:13 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Aug 15 15:32:13 2008 -0700 |
| tree | 247c3e25958ff362b8a7b5b735a1e7d2ef6842c7 | |
| parent | d121db94eb50b29a202b5f6a8671cbebdf2c4142 [diff] | |
| parent | 5cd9c58fbe9ec92b45b27e131719af4f2bd9eb40 [diff] |
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: security: Fix setting of PF_SUPERPRIV by __capable()