Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net into net
David S. Miller [Tue, 19 Feb 2013 04:32:49 +0000 (23:32 -0500)]
Pull in 'net' to take in the bug fixes that didn't make it into
3.8-final.

Also, deal with the semantic conflict of the change made to
net/ipv6/xfrm6_policy.c   A missing rt6->n neighbour release
was added to 'net', but in 'net-next' we no longer cache the
neighbour entries in the ipv6 routes so that change is not
appropriate there.

Signed-off-by: David S. Miller <davem@davemloft.net>

1  2 
MAINTAINERS
drivers/net/ethernet/atheros/atl1c/atl1c_main.c
drivers/net/ethernet/cadence/macb.c
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
drivers/net/usb/cdc_ncm.c
drivers/net/xen-netback/interface.c
include/net/sock.h
net/batman-adv/distributed-arp-table.c
net/ipv6/netfilter/nf_conntrack_reasm.c
net/netfilter/nf_conntrack_helper.c
net/netfilter/nf_conntrack_netlink.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge