From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 30 Jul 2012 18:21:12 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=172f993a2941ec60685c7e33af8be701759de1ab;p=linux.git

Merge branch 'for-linus' of git://git./linux/kernel/git/jmorris/linux-security

Pull security subsystem bugfixes from James Morris.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  selinux: fix selinux_inode_setxattr oops
  KEYS: linux/key-type.h needs linux/errno.h
  smack: off by one error
---

172f993a2941ec60685c7e33af8be701759de1ab