]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
projects / mirror_ubuntu-disco-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 90a4c0f 456a816)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 19 Jan 2012 19:46:08 +0000 (11:46 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 19 Jan 2012 19:46:08 +0000 (11:46 -0800)
commitafd290945cd283030b51b433a66fe57a8feb28c8
treea389cb472d0ca242e02e86becd4a1967dfb0624btree
parent90a4c0f51e8e44111a926be6f4c87af3938a79c3commit | diff
parent456a8167e94b66f406c27400a46a707b870452b0commit | diff
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  KEYS: Permit key_serial() to be called with a const key pointer
  keys: fix user_defined key sparse messages
  ima: fix cred sparse warning
  MPILIB: Add a missing ENOMEM check
Ubuntu Disco kernel mirror for Proxmox VE and PMG