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

diff --combined kernel-2.6.spec
index eae5238,67463b3..708e3ff
--- 1/kernel-2.6.spec
--- 2/kernel-2.6.spec
+++ b/kernel-2.6.spec
@@@ -10,7 -10,7 +10,7 @@@ URL: %{SCMURL
  
  %define name linux-2.6
  %define module_version_varname sublevel
- %define taglevel 27
+ %define taglevel 28
  
  %define sublevel 32
  
@@@ -661,7 -661,7 +661,7 @@@ Source81: config-i686-debug-rhe
  Source82: config-generic
  Source83: config-x86_64-debug-rhel
  
 -Patch0: bcm5720.diff
 +Patch0: linux-2.6-001-bcm5720.patch
  Patch1: patch-2.6.32-131.0.15.el6-vs2.3.0.36.29.6.diff
  Patch2: linux-2.6-255-vserver-delta-cow-fix23.patch
  Patch3: linux-2.6-250-ipsets.patch
@@@ -980,7 -980,7 +980,7 @@@ cp %{SOURCE15} %{SOURCE1} %{SOURCE16} %
  make -f %{SOURCE20} VERSION=%{version} configs
  
  #### Planet-Lab ####
 -ApplyPatch bcm5720.diff
 +ApplyPatch linux-2.6-001-bcm5720.patch
  ApplyPatch patch-2.6.32-131.0.15.el6-vs2.3.0.36.29.6.diff
  ApplyPatch linux-2.6-255-vserver-delta-cow-fix23.patch
  ApplyPatch linux-2.6-250-ipsets.patch
@@@ -1795,6 -1795,10 +1795,10 @@@ f
  %endif
  
  %changelog
+ * Tue May 01 2012 Sapan Bhatia <sapanb@cs.princeton.edu> - linux-2.6-32-28
+ - This patch adds a backported version of a patchset to support the bcm5720 chipset, used by various PlanetLab and MLab
+ - members.
+ 
  * Mon Nov 07 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - linux-2.6-32-27
  - 2 places for pulling sources from in case of network outage