]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit81f51f06e8d0295617be42f5af1c887ec9e6f0d7
treea389cb472d0ca242e02e86becd4a1967dfb0624b
parent01e1e3eac7c8b13d0f4dc4a59abbbbcd21736dfd
parent7fedc235b049ce148bbf21a321e9317f4bdaba21
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