From: David S. Miller <davem@davemloft.net>
Date: Sat, 10 Nov 2012 23:32:51 +0000 (-0500)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: omap-for-v3.8/fixes-for-merge-window-v4-signed~45^2~381
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4185bbf62a5d8d777ee445db1581beb17882a07;p=pandora-kernel.git

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

Conflicts:
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

Minor conflict between the BCM_CNIC define removal in net-next
and a bug fix added to net.  Based upon a conflict resolution
patch posted by Stephen Rothwell.

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

d4185bbf62a5d8d777ee445db1581beb17882a07
Reading git-diff-tree failed