From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 10 Mar 2011 00:45:02 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Tag: 2.1b_release~5106
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ab02a9540541dd7b2012f32f5e311c3cbd772387;p=platform%2Fkernel%2Fkernel-mfld-blackbay.git

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
  net: don't allow CAP_NET_ADMIN to load non-netdev kernel modules
---

ab02a9540541dd7b2012f32f5e311c3cbd772387