From: David S. Miller <davem@davemloft.net>
Date: Mon, 27 Feb 2012 02:55:51 +0000 (-0500)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: v3.4-rc1~177^2~175
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff4783ce78c08d2990126ce1874250ae8e72bbd2;p=pandora-kernel.git

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

Conflicts:
	drivers/net/ethernet/sfc/rx.c

Overlapping changes in drivers/net/ethernet/sfc/rx.c, one to change
the rx_buf->is_page boolean into a set of u16 flags, and another to
adjust how ->ip_summed is initialized.

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

ff4783ce78c08d2990126ce1874250ae8e72bbd2
Reading git-diff-tree failed