git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
130cd27
d3976a5
)
Merge branch 'master' of git://1984.lsi.us.es/nf-next
author
David S. Miller
<davem@davemloft.net>
Fri, 16 Nov 2012 17:42:43 +0000
(12:42 -0500)
committer
David S. Miller
<davem@davemloft.net>
Fri, 16 Nov 2012 17:42:43 +0000
(12:42 -0500)
Conflicts:
net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
Minor conflict due to some IS_ENABLED conversions done
in net-next.
Signed-off-by: David S. Miller <davem@davemloft.net>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff