projects / GitHub / LineageOS / android_kernel_samsung_universal7580.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 96e35b4 6c9ff10)
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)
* '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


Trivial merge