Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 9 Apr 2009 00:44:28 +0000 (17:44 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 9 Apr 2009 00:44:28 +0000 (17:44 -0700)
commit3d4d4c8bb63a705d95a46d299469d8a10b8b229c
treea1f84ab852eea06c156254333513621c1f1c8fa6
parentc71d9caf6cfdee56da2924a054cc84cbe91d82b6
parent5bf37ec3e0f5eb79f23e024a7fbc8f3557c087f0
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:
  cap_prctl: don't set error to 0 at 'no_change'