]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net into net
authorDavid S. Miller <davem@davemloft.net>
Tue, 19 Feb 2013 04:32:49 +0000 (23:32 -0500)
committerDavid S. Miller <davem@davemloft.net>
Tue, 19 Feb 2013 04:34:21 +0000 (23:34 -0500)
commit7847457679bc4acb8748ef99bf265b051b79da0c
tree461c4acae130771b9856715bc2cfdc341b6e5964
parent04637c4a5e7655944ab93ab32529b686d110d809
parent2b199e530bc2a0b6ef4d97292ebe0556e200361c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net into net

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>
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