From: David S. Miller <davem@davemloft.net>
Date: Fri, 28 Sep 2012 18:40:49 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: omap-for-v3.7-rc1/fixes-cpufreq-signed~47^2~54
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a06e5e1bb217be077e1f8ee2745b4c5b1aa02db;p=pandora-kernel.git

Merge git://git./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>
---

6a06e5e1bb217be077e1f8ee2745b4c5b1aa02db
Reading git-diff-tree failed