projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 130cd27 d3976a5)
Merge branch 'master' of git://1984.lsi.us.es/nf-next
authorDavid S. Miller <davem@davemloft.net>
Fri, 16 Nov 2012 17:42:43 +0000 (12:42 -0500)
committerDavid S. Miller <davem@davemloft.net>
Fri, 16 Nov 2012 17:42:43 +0000 (12:42 -0500)
commit545b29019c8959c805abfe8194d47e989f1a6e5f
tree120f88abf0b4b2317072579c667fddfccb930fe5tree | snapshot (tar.gz zip)
parent130cd273d4a46a3011b1cc739f5d2af78779d666commit | diff
parentd3976a53ce1f4763cb910d047e8763e4c696e5f7commit | diff
Merge branch 'master' of git://1984.lsi.us.es/nf-next

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>
net/ipv4/netfilter/iptable_nat.c diff1 | diff2 | blob | history
net/ipv6/netfilter/ip6table_nat.c diff1 | diff2 | blob | history
net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c diff1 | diff2 | blob | history