projects
/
platform
/
kernel
/
kernel-mfld-blackbay.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
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...
author
Linus Torvalds
<torvalds@linux-foundation.org>
Thu, 10 Mar 2011 00:45:02 +0000
(16:45 -0800)
committer
Linus 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