From: Thierry Parmentelat Date: Thu, 6 Oct 2011 17:52:46 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.onelab.eu/git/build X-Git-Tag: lxcbuild~57 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=dcca3833434679cc8b98124f3d436a0b9f1e7168;hp=bdbe2fc78993d215cfdf10039970a9fcb4a313a7;p=build.git Merge branch 'master' of ssh://git.onelab.eu/git/build --- diff --git a/planetlab-k32-tags.mk b/planetlab-k32-tags.mk index e01b0453..beb44175 100644 --- a/planetlab-k32-tags.mk +++ b/planetlab-k32-tags.mk @@ -2,7 +2,7 @@ mkinitrd-GITPATH := git://git.planet-lab.org/mkinitrd.git@mkinitrd-5.1.19.6-2 linux-2.6-BRANCH := rhel6 -linux-2.6-GITPATH := git://git.planet-lab.org/linux-2.6.git@linux-2.6-32-25 +linux-2.6-GITPATH := git://git.planet-lab.org/linux-2.6.git@linux-2.6-32-26 # help out spec2make on f8 and centos5, due to a bug in rpm ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 centos5)" kernel-WHITELIST-RPMS := kernel-devel,kernel-headers