OSDN Git Service
(root)
/
sagit-ice-cold
/
kernel_xiaomi_msm8998.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f43100a
06c22da
)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
author
Linus Torvalds
<torvalds@linux-foundation.org>
Thu, 5 Aug 2010 21:26:19 +0000
(14:26 -0700)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Thu, 5 Aug 2010 21:26:19 +0000
(14:26 -0700)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
apparmor: depends on NET
Trivial merge