11 files changed, 11 insertions, 11 deletions
diff --git a/conf/distro/debianslug.conf b/conf/distro/debianslug.conf
index e496398c33..16c54c77da 100644
--- a/conf/distro/debianslug.conf
+++ b/conf/distro/debianslug.conf
@@ -6,7 +6,7 @@
 # STANDARD DebianSlug DEFINITIONS
 #----------------------------------------------------------------------------------
 DISTRO_NAME = "DebianSlug"
-DISTRO_VERSION = "3.1-beta"
+DISTRO_VERSION = "3.2-beta"
 DISTRO_FEED = "unstable"
 DISTRO_TYPE = "beta"
 SLUGOS_IMAGENAME = "debianslug"
diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf
index f5b5e75a60..8c1a16c77f 100644
--- a/conf/distro/openslug.conf
+++ b/conf/distro/openslug.conf
@@ -6,7 +6,7 @@
 # STANDARD OpenSlug DEFINITIONS
 #----------------------------------------------------------------------------------
 DISTRO_NAME = "OpenSlug"
-DISTRO_VERSION = "3.1-beta"
+DISTRO_VERSION = "3.2-beta"
 DISTRO_FEED = "unstable"
 DISTRO_TYPE = "beta"
 SLUGOS_IMAGENAME = "openslug"
diff --git a/conf/distro/slugos-bag.conf b/conf/distro/slugos-bag.conf
index c1f5ef8d03..3710243dab 100644
--- a/conf/distro/slugos-bag.conf
+++ b/conf/distro/slugos-bag.conf
@@ -6,7 +6,7 @@
 
 # This slugos variant corresponds to OpenSlug
 DISTRO_NAME ?= "slugos-bag"
-DISTRO_VERSION ?= "3.0-beta"
+DISTRO_VERSION ?= "3.2-beta"
 DISTRO_FEED ?= "unstable"
 DISTRO_TYPE ?= "beta"
 
diff --git a/conf/distro/slugos-bau.conf b/conf/distro/slugos-bau.conf
index 72bafc1c1c..9a025d1bbd 100644
--- a/conf/distro/slugos-bau.conf
+++ b/conf/distro/slugos-bau.conf
@@ -7,7 +7,7 @@
 # This slugos variant is not supported - there are no nslu2-linux.org
 # regular builds and there is no feed.
 DISTRO_NAME ?= "slugos-bau"
-DISTRO_VERSION ?= "0-beta"
+DISTRO_VERSION ?= "3.2-beta"
 DISTRO_FEED ?= "unstable"
 DISTRO_TYPE ?= "alpha"
 
diff --git a/conf/distro/slugos-btu.conf b/conf/distro/slugos-btu.conf
index 8c06605bc7..33f5d0a952 100644
--- a/conf/distro/slugos-btu.conf
+++ b/conf/distro/slugos-btu.conf
@@ -6,7 +6,7 @@
 
 # This slugos variant corresponds to UcSlugC
 DISTRO_NAME ?= "slugos-btu"
-DISTRO_VERSION ?= "3-beta"
+DISTRO_VERSION ?= "3.2-beta"
 DISTRO_FEED ?= "unstable"
 DISTRO_TYPE ?= "beta"
 
diff --git a/conf/distro/slugos-lag.conf b/conf/distro/slugos-lag.conf
index c29958439b..ddfeba3c59 100644
--- a/conf/distro/slugos-lag.conf
+++ b/conf/distro/slugos-lag.conf
@@ -5,7 +5,7 @@
 # This slugos variant is not supported - there are no nslu2-linux.org
 # regular builds and there is no feed.
 DISTRO_NAME ?= "slugos-lag"
-DISTRO_VERSION ?= "0-beta"
+DISTRO_VERSION ?= "3.2-beta"
 DISTRO_FEED ?= "unstable"
 DISTRO_TYPE ?= "alpha"
 
diff --git a/conf/distro/slugos-lau.conf b/conf/distro/slugos-lau.conf
index 3233f76364..6dc2c1f77b 100644
--- a/conf/distro/slugos-lau.conf
+++ b/conf/distro/slugos-lau.conf
@@ -5,7 +5,7 @@
 # This slugos variant is not supported - there are no nslu2-linux.org
 # regular builds and there is no feed.
 DISTRO_NAME ?= "slugos-lau"
-DISTRO_VERSION ?= "0-beta"
+DISTRO_VERSION ?= "3.2-beta"
 DISTRO_FEED ?= "unstable"
 DISTRO_TYPE ?= "alpha"
 
diff --git a/conf/distro/slugos-ltu.conf b/conf/distro/slugos-ltu.conf
index 6d99e629ee..9e02bd1bb9 100644
--- a/conf/distro/slugos-ltu.conf
+++ b/conf/distro/slugos-ltu.conf
@@ -5,7 +5,7 @@
 # This slugos variant is not supported - there are no nslu2-linux.org
 # regular builds and there is no feed.
 DISTRO_NAME ?= "slugos-ltu"
-DISTRO_VERSION ?= "0-beta"
+DISTRO_VERSION ?= "3.2-beta"
 DISTRO_FEED ?= "unstable"
 DISTRO_TYPE ?= "alpha"
 
diff --git a/conf/distro/slugos.conf b/conf/distro/slugos.conf
index 572e20e730..16a5999738 100644
--- a/conf/distro/slugos.conf
+++ b/conf/distro/slugos.conf
@@ -166,7 +166,7 @@ PREFERRED_VERSION_glibc ?= "2.3.5+cvs20050627"
 # Select the correct versions of the kernel and modules (these are the
 # defaults, override in the conf/distro top-level distro file).
 PREFERRED_PROVIDER_virtual/kernel ?= "ixp4xx-kernel"
-PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.15.1"
+PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.15.2"
 
 # Built-in ethernet modules
 PREFERRED_PROVIDER_virtual/ixp-eth ?= "ixp400-eth"
diff --git a/conf/distro/ucslugc.conf b/conf/distro/ucslugc.conf
index c9c70ca544..45daeb6632 100644
--- a/conf/distro/ucslugc.conf
+++ b/conf/distro/ucslugc.conf
@@ -4,7 +4,7 @@
 
 # This is SLUGOS-BTU with a different name...
 DISTRO_NAME = "UcSlugC"
-DISTRO_VERSION = "3-beta"
+DISTRO_VERSION = "3.2-beta"
 DISTRO_FEED = "unstable"
 DISTRO_TYPE = "beta"
 SLUGOS_IMAGENAME = "ucslugc"
diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf
index 59c29551f9..cab50dbdf6 100644
--- a/conf/machine/h3900.conf
+++ b/conf/machine/h3900.conf
@@ -35,4 +35,4 @@ include conf/machine/include/handheld-common.conf
 GUI_MACHINE_CLASS = "smallscreen"
 
 # not using tune-xscale so as to retain backwards compatibility
-include conf/machine/tune-strongarm.conf
+include conf/machine/tune-xscale.conf