From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 22 Jan 2013 18:10:10 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=a7ed6c4320a638971c81a7c273458eee3db5025b;p=openwrt%2Fstaging%2Fblogic.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:
  security/device_cgroup: lock assert fails in dev_exception_clean()
  evm: checking if removexattr is not a NULL
---

a7ed6c4320a638971c81a7c273458eee3db5025b