Merge commit 'origin/master'

diff --git a/onelab-k27-tags.mk b/onelab-k27-tags.mk
index 1743ec3..ac95954 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-34
+linux-2.6-GITPATH              := git://git.onelab.eu/linux-2.6.git@linux-2.6-27-35
 madwifi-GITPATH                 := git://git.onelab.eu/madwifi.git@madwifi-4132-2
 iptables-GITPATH                := git://git.onelab.eu/iptables.git@iptables-1.4.10-4
 iptables-BUILD-FROM-SRPM        := yes # tmp

diff --git a/planetlab-k27-tags.mk b/planetlab-k27-tags.mk
index 97ffa83..9a5d8b3 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-34
+linux-2.6-GITPATH              := git://git.planet-lab.org/linux-2.6.git@linux-2.6-27-35
 madwifi-GITPATH                        := git://git.planet-lab.org/madwifi.git@madwifi-4132-2
 iptables-GITPATH                := git://git.planet-lab.org/iptables.git@iptables-1.4.10-4
 iptables-BUILD-FROM-SRPM := yes        # tmp