Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Aug 2010 01:37:03 +0000 (18:37 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Aug 2010 01:37:03 +0000 (18:37 -0700)
commit3b89f56783a4ef796190ef1192c25e72e0b986b6
tree9d34f03092a38fd79f14003c88489323f32d9334
parent392abeea52db4dc870c0ea41912df8ca60b27d44
parent7cb4dc9fc95f89587f57f287b47e091d7806255e
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:
  AppArmor: fix task_setrlimit prototype