From: David S. Miller <davem@davemloft.net>
Date: Fri, 21 Aug 2015 18:44:04 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: omap-for-v4.3/fixes-rc1~110^2~115
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc25b25897289bad4907f30151ffe5baf75ff369;p=pandora-kernel.git

Merge git://git./linux/kernel/git/davem/net

Conflicts:
	drivers/net/usb/qmi_wwan.c

Overlapping additions of new device IDs to qmi_wwan.c

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

dc25b25897289bad4907f30151ffe5baf75ff369
Reading git-diff-tree failed