From: David S. Miller <davem@davemloft.net>
Date: Tue, 24 Mar 2015 02:22:43 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: omap-for-v4.2/o2_dc~131^2~159
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5c1d8c567781932e3ab2c62e8fcfee0283d9580;p=pandora-kernel.git

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

Conflicts:
	net/netfilter/nf_tables_core.c

The nf_tables_core.c conflict was resolved using a conflict resolution
from Stephen Rothwell as a guide.

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

d5c1d8c567781932e3ab2c62e8fcfee0283d9580
Reading git-diff-tree failed