Merge commit 'origin/master'

diff --git a/onelab-k27-tags.mk b/onelab-k27-tags.mk
index 8a40c75..5185341 100644 (file)
--- a/onelab-k27-tags.mk
+++ b/onelab-k27-tags.mk
@@ -1,7 +1,7 @@
 # build-GITPATH is now set by vbuild-nightly.sh to avoid duplication
 
 ###
-linux-2.6-GITPATH              := git://git.onelab.eu/linux-2.6.git@linux-2.6-27-31
+linux-2.6-GITPATH              := git://git.onelab.eu/linux-2.6.git@linux-2.6-27-32
 madwifi-SVNPATH                        := http://svn.planet-lab.org/svn/madwifi/tags/madwifi-4099-0
 iptables-GITPATH                := git://git.onelab.eu/iptables.git@iptables-1.4.9-0
 iptables-BUILD-FROM-SRPM        := yes # tmp

diff --git a/planetlab-k27-tags.mk b/planetlab-k27-tags.mk
index 0589fb4..bb20d6b 100644 (file)
--- a/planetlab-k27-tags.mk
+++ b/planetlab-k27-tags.mk
@@ -1,6 +1,6 @@
 # build-GITPATH is now set by vbuild-nightly.sh to avoid duplication
 
-linux-2.6-GITPATH              := git://git.planet-lab.org/linux-2.6.git@linux-2.6-27-31
+linux-2.6-GITPATH              := git://git.planet-lab.org/linux-2.6.git@linux-2.6-27-32
 madwifi-SVNPATH                        := http://svn.planet-lab.org/svn/madwifi/tags/madwifi-4099-0
 iptables-GITPATH                := git://git.planet-lab.org/iptables.git@iptables-1.4.9-0
 iptables-BUILD-FROM-SRPM := yes        # tmp