]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b5d465d 632b8a6)
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)
commitff924b1bc4ea62b7ffa72b6406015c83f1cbee22
tree120f88abf0b4b2317072579c667fddfccb930fe5tree | snapshot
parentb5d465dda08756fc8b23fbca0eb3febf3f3ca3fdcommit | diff
parent632b8a641e62814a10117658c0a593fca526b703commit | 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.