tree a1f84ab852eea06c156254333513621c1f1c8fa6
parent c71d9caf6cfdee56da2924a054cc84cbe91d82b6
parent 5bf37ec3e0f5eb79f23e024a7fbc8f3557c087f0
author Linus Torvalds <torvalds@linux-foundation.org> 1239237868 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1239237868 -0700

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:
  cap_prctl: don't set error to 0 at 'no_change'