From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 19 Jan 2012 19:46:08 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~15675
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=afd290945cd283030b51b433a66fe57a8feb28c8;p=mirror_ubuntu-artful-kernel.git

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
---

afd290945cd283030b51b433a66fe57a8feb28c8