From: Linus Torvalds Date: Thu, 17 Oct 2013 17:16:45 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=b2118ea97113de62ca5e19c1d92cf9c2966c45e8;p=openwrt%2Fstaging%2Fblogic.git Merge branch 'for-linus' of git://git./linux/kernel/git/jmorris/linux-security Pull apparmor fixes from James Morris: "A couple more regressions fixed" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: apparmor: fix bad lock balance when introspecting policy apparmor: fix memleak of the profile hash --- b2118ea97113de62ca5e19c1d92cf9c2966c45e8