Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 22 Jan 2013 18:10:10 +0000 (10:10 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 22 Jan 2013 18:10:10 +0000 (10:10 -0800)
commita7ed6c4320a638971c81a7c273458eee3db5025b
treeb7e6a2000f62ca423befdfd41ff2d8188c50ad8a
parent9067ac85d533651b98c2ff903182a20cbb361fcb
parent103a197c0c4ec936f5a243b5b092e4e49213f569
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:
  security/device_cgroup: lock assert fails in dev_exception_clean()
  evm: checking if removexattr is not a NULL