Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 13 May 2011 01:16:13 +0000 (18:16 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 13 May 2011 01:16:13 +0000 (18:16 -0700)
commit381e7863d94891035a1a6b7836e9db72f9f1cba1
treee04c956c7bf479041d444ba0401402d90daccee9
parent446cc6345d3de6571bdd0840f48aca441488a28d
parentca7d12000895ae5dfef8b8ff2648a0d50abd397c
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: delete debugging printks from filename_trans rule processing