Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 Aug 2008 22:32:13 +0000 (15:32 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 Aug 2008 22:32:13 +0000 (15:32 -0700)
commit71ef2a46fce43042a60d7ccbf55ecbd789c03c2e
tree247c3e25958ff362b8a7b5b735a1e7d2ef6842c7
parentd121db94eb50b29a202b5f6a8671cbebdf2c4142
parent5cd9c58fbe9ec92b45b27e131719af4f2bd9eb40
Merge branch 'for-linus' of git://git./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()