From: Sapan Bhatia <gwsapan@gmail.com>
Date: Tue, 1 May 2012 16:21:13 +0000 (-0400)
Subject: Merge branch '32' of ssh://git.planet-lab.org/git/linux-2.6 into 32
X-Git-Tag: linux-2.6-32-30~2
X-Git-Url: http://git.onelab.eu/?p=linux-2.6.git;a=commitdiff_plain;h=0b7839743ba9837073cfbddb4b2997b5f62e7852;hp=fe01b25eb5e139b0a7f48affe70f969c5bcc1732

Merge branch '32' of ssh://git.planet-lab.org/git/linux-2.6 into 32
---

diff --git a/linux-2.6-001-bcm5720.patch b/linux-2.6-001-bcm5720.patch
index cbd19a806..920e47618 100644
--- a/linux-2.6-001-bcm5720.patch
+++ b/linux-2.6-001-bcm5720.patch
@@ -62,7 +62,7 @@ diff -Nurb linux-2.6.32-27.planetlab.i686/drivers/net/tg3.c ../kernel-2.6/linux-
  
  	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704 ||
  	    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5714 ||
--	    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717) {
+-	    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 {
 +	    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717) || 
 +            GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5720))
  		struct net_device *dev_peer;