| commit | 250541fca717a5c9b0d3710e737b2ca32ebb6fbc | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Apr 14 18:46:03 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Apr 14 18:46:03 2010 -0700 |
| tree | 9177c31846ec2bbc5c3bc6054f15015f703edc2c | |
| parent | 96e35b40c0d6206f56370f937f6f4722739eb273 [diff] | |
| parent | 6c9ff1013b7a21099da838eeef7c3f23ee347957 [diff] |
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: SELinux: Reduce max avtab size to avoid page allocation failures