git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

author	David S. Miller <davem@davemloft.net>
	Tue, 19 Feb 2013 04:32:49 +0000 (23:32 -0500)
committer	David S. Miller <davem@davemloft.net>
	Tue, 19 Feb 2013 04:34:21 +0000 (23:34 -0500)
commit	6338a53a2bd02d5878ab449371323364b7cc7694
tree	461c4acae130771b9856715bc2cfdc341b6e5964	tree \| snapshot
parent	8064b3cf750e71fdaf306abb4433a93d0f45f4c9	commit \| diff
parent	18cf0d0784b4a634472ed24d0d7ca1c721d93e90	commit \| diff

Merge git://git./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>

John Crispins staging tree

RSS Atom

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