tree 8faea23112a11f52524eb413f71b7b02712d8b53
parent d9f72f359e00a45a6cd7cc2d5121b04b9dc927e1
parent 6672d90fe779dc0dfffe027c3ede12609df091c2
author David S. Miller <davem@davemloft.net> 1348857649 -0400
committer David S. Miller <davem@davemloft.net> 1348857649 -0400

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
	drivers/net/team/team.c
	drivers/net/usb/qmi_wwan.c
	net/batman-adv/bat_iv_ogm.c
	net/ipv4/fib_frontend.c
	net/ipv4/route.c
	net/l2tp/l2tp_netlink.c

The team, fib_frontend, route, and l2tp_netlink conflicts were simply
overlapping changes.

qmi_wwan and bat_iv_ogm were of the "use HEAD" variety.

With help from Antonio Quartulli.

Signed-off-by: David S. Miller <davem@davemloft.net>