]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
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)
* '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


Trivial merge