projects / linux-flexiantxendom0-natty.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 684adca 8909c9a)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 10 Mar 2011 00:45:02 +0000 (16:45 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 10 Mar 2011 00:45:02 +0000 (16:45 -0800)
* '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


Trivial merge
Port of xen3.3 xenlinux code to Ubuntu Natty kernel