Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 15 Apr 2010 01:46:03 +0000 (18:46 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 15 Apr 2010 01:46:03 +0000 (18:46 -0700)
commit250541fca717a5c9b0d3710e737b2ca32ebb6fbc
tree9177c31846ec2bbc5c3bc6054f15015f703edc2c
parent96e35b40c0d6206f56370f937f6f4722739eb273
parent6c9ff1013b7a21099da838eeef7c3f23ee347957
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:
  SELinux: Reduce max avtab size to avoid page allocation failures