tree 02ee87c6174bc8a8ada8990fa6786a97b98802c7
parent dbfad21422f8d2c0866185b3e449c4a6ebaec4e2
parent 51b79bee627d526199b2f6a6bef8ee0c0739b6d1
author Linus Torvalds <torvalds@linux-foundation.org> 1334805362 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1334805362 -0700

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:
  security: fix compile error in commoncap.c