author | Linus Torvalds <torvalds@linux-foundation.org> | |
Tue, 22 Jan 2013 18:10:10 +0000 (10:10 -0800) | ||
committer | Linus Torvalds <torvalds@linux-foundation.org> | |
Tue, 22 Jan 2013 18:10:10 +0000 (10:10 -0800) |
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
* '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
Trivial merge