Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 19 Apr 2012 03:16:02 +0000 (20:16 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 19 Apr 2012 03:16:02 +0000 (20:16 -0700)
commit932e9f352b5d685725076f21b237f7c7d804b29c
tree02ee87c6174bc8a8ada8990fa6786a97b98802c7
parentdbfad21422f8d2c0866185b3e449c4a6ebaec4e2
parent51b79bee627d526199b2f6a6bef8ee0c0739b6d1
Merge branch 'for-linus' of git://git./linux/kernel/git/jmorris/linux-security

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  security: fix compile error in commoncap.c