From: David S. Miller <davem@davemloft.net>
Date: Tue, 12 Mar 2013 09:52:22 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: omap-for-v3.10/dt-fixes-for-merge-window~65^2~506
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e5f2ef7ab4690d2e8faaf5fd203c5ecd70c3abaf;p=pandora-kernel.git

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

Conflicts:
	drivers/net/ethernet/intel/e1000e/netdev.c

Minor conflict in e1000e, a line that got fixed in 'net'
has been removed in 'net-next'.

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

e5f2ef7ab4690d2e8faaf5fd203c5ecd70c3abaf
Reading git-diff-tree failed