]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 97af2ee 08e133a)
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)
commit3e0dac5d02356369b4c55bb474c7eb0fa255db10
tree120f88abf0b4b2317072579c667fddfccb930fe5tree | snapshot
parent97af2eee10b3683c4f52bc8cc2c28e256d56189acommit | diff
parent08e133adc2e068279efd9399f6d9ef6829aef313commit | 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
Linux Kernel Source Tree.