git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0902b46
1ab6c16
)
Merge branch 'master' of /repos/git/net-next-2.6
author
Patrick McHardy
<kaber@trash.net>
Tue, 15 Jun 2010 15:31:06 +0000
(17:31 +0200)
committer
Patrick McHardy
<kaber@trash.net>
Tue, 15 Jun 2010 15:31:06 +0000
(17:31 +0200)
Conflicts:
include/net/netfilter/xt_rateest.h
net/bridge/br_netfilter.c
net/netfilter/nf_conntrack_core.c
Signed-off-by: Patrick McHardy <kaber@trash.net>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff