From: David S. Miller <davem@davemloft.net>
Date: Thu, 24 Apr 2014 17:19:00 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: omap-for-v3.16/fixes-against-rc1~36^2~326
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4366004d77278a90c18f92f7cb9ec0c264da563d;p=pandora-kernel.git

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

Conflicts:
	drivers/net/ethernet/intel/igb/e1000_mac.c
	net/core/filter.c

Both conflicts were simple overlapping changes.

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

4366004d77278a90c18f92f7cb9ec0c264da563d
Reading git-diff-tree failed