tree 4d21e9a02bfbdafe5fc598af0755db791238dbe7
parent 8b9a4d56866e0dca6ae886ed9bff777e50d0b70c
parent 836dc9e3fbbab0c30aa6e664417225f5c1fb1c39
author David S. Miller <davem@davemloft.net> 1360364534 -0500
committer David S. Miller <davem@davemloft.net> 1360364534 -0500

Merge git://git.kernel.org/pub/scm/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 <davem@davemloft.net>