OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8d25b36
7d7e5a6
)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
author
Linus Torvalds
<torvalds@linux-foundation.org>
Sat, 26 Jul 2008 00:40:16 +0000
(17:40 -0700)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Sat, 26 Jul 2008 00:40:16 +0000
(17:40 -0700)
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
ipsec: ipcomp - Decompress into frags if necessary
ipsec: ipcomp - Merge IPComp implementations
pkt_sched: Fix locking in shutdown_scheduler_queue()
Trivial merge