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

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index eae5238..708e3ff 100644 (file)
--- a/kernel-2.6.spec
+++ b/kernel-2.6.spec
@@ -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
 
@@ -1795,6 +1795,10 @@ fi
 %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