Merge commit 'origin/master'

[build.git] / planetlab-k32-tags.mk

diff --git a/planetlab-k32-tags.mk b/planetlab-k32-tags.mk
index 09633dc..e103bf1 100644 (file)
--- a/planetlab-k32-tags.mk
+++ b/planetlab-k32-tags.mk
@@ -2,14 +2,14 @@
 
 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-14
+linux-2.6-GITPATH              := git://git.planet-lab.org/linux-2.6.git@linux-2.6-32-15
 # 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
 endif
 kernel-DEVEL-RPMS              += elfutils-libelf-devel
 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-3
+iptables-GITPATH                := git://git.planet-lab.org/iptables.git@iptables-1.4.10-4
 iptables-BUILD-FROM-SRPM := yes        # tmp
 iproute-BUILD-FROM-SRPM := yes 
 iproute2-GITPATH               := git://git.planet-lab.org/iproute2.git@iproute2-2.6.35-0