]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 7 Apr 2012 16:51:36 +0000 (09:51 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 7 Apr 2012 16:51:36 +0000 (09:51 -0700)
commitd6a624eef128c97b35fcea47cd00ef22f005e7aa
treee547bfbbddc2ffa872949cc3bfe95a03d38a3783
parentf21fec96ead90eae7bcb3c847e8115c119c5dc62
parent620f6e8e855d6d447688a5f67a4e176944a084e8
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

Pull security layer fixlet from James Morris.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  sysctl: fix write access to dmesg_restrict/kptr_restrict