From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 15 Aug 2008 22:32:13 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=71ef2a46fce43042a60d7ccbf55ecbd789c03c2e;p=linux-edison.git

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()
---

71ef2a46fce43042a60d7ccbf55ecbd789c03c2e