From: David S. Miller Date: Fri, 8 Feb 2013 23:02:14 +0000 (-0500) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net X-Git-Tag: firefly_0821_release~3680^2~1092^2~122 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fd5023111cf720db890ef34f305ac5d427e690a0;p=firefly-linux-kernel-4.4.55.git Merge git://git./linux/kernel/git/davem/net Synchronize with 'net' in order to sort out some l2tp, wireless, and ipv6 GRE fixes that will be built on top of in 'net-next'. Signed-off-by: David S. Miller --- fd5023111cf720db890ef34f305ac5d427e690a0