From: David S. Miller <davem@davemloft.net>
Date: Wed, 23 Oct 2013 20:28:39 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: v3.13-rc1~105^2~136
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c3fa32b9764dc45dcf8a2231b1c110abc4a63e0b;p=pandora-kernel.git

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

Conflicts:
	drivers/net/usb/qmi_wwan.c
	include/net/dst.h

Trivial merge conflicts, both were overlapping changes.

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

c3fa32b9764dc45dcf8a2231b1c110abc4a63e0b
Reading git-diff-tree failed