From: David S. Miller <davem@davemloft.net>
Date: Thu, 1 Mar 2012 22:57:40 +0000 (-0500)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: v3.4-rc1~177^2~157
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b4017c5368f992fb8fb3a2545a0977082c6664e4;p=pandora-kernel.git

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

Conflicts:
	drivers/net/ethernet/broadcom/tg3.c

Conflicts in the statistics regression bug fix from 'net',
but happily Matt Carlson originally posted the fix against
'net-next' so I used that to resolve this.

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

b4017c5368f992fb8fb3a2545a0977082c6664e4
Reading git-diff-tree failed