Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 27 May 2009 01:03:40 +0000 (18:03 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 27 May 2009 01:03:40 +0000 (18:03 -0700)
commit8784cdd9af0e3b6a8a42b538db51d7f1951be956
tree5161ff08d7d8f7d3baeb2d72f98fc54e8f58654e
parentcd86a536c81e9300d984327517548ca0652eebf9
parentb1338d199dda6681d9af0297928af0a7eb9cba7b
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:
  tomoyo: add missing call to cap_bprm_set_creds