From: David S. Miller Date: Tue, 19 Feb 2013 04:32:49 +0000 (-0500) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net into net X-Git-Tag: firefly_0821_release~3680^2~1092^2~29 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6338a53a2bd02d5878ab449371323364b7cc7694;p=firefly-linux-kernel-4.4.55.git 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 --- 6338a53a2bd02d5878ab449371323364b7cc7694