tree 3fb17b54454a101416c2b22e6b4ea5a027b3c02b
parent ed3b856b69a7f3748d6917e42d462c962aaa39b8
parent fa809e2fd6e317226c046202a88520962672eac0
author David S. Miller <davem@davemloft.net> 1340664632 -0700
committer David S. Miller <davem@davemloft.net> 1340664632 -0700

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

Conflicts:
	drivers/net/usb/qmi_wwan.c
	net/batman-adv/translation-table.c
	net/ipv6/route.c

qmi_wwan.c resolution provided by Bjørn Mork.

batman-adv conflict is dealing merely with the changes
of global function names to have a proper subsystem
prefix.

ipv6's route.c conflict is merely two side-by-side additions
of network namespace methods.

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