diff --git a/[refs] b/[refs]
index c128f1ebaffc..278b06f56de2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1ad0ceacb4cdb2d5eac320bea166ff728fadadeb
+refs/heads/master: ce9b9febe1cf3e01a7dcb0d3772734addb96606c
diff --git a/trunk/arch/arm/boot/dts/stmp378x_devb.dts b/trunk/arch/arm/boot/dts/imx23-stmp378x_devb.dts
similarity index 100%
rename from trunk/arch/arm/boot/dts/stmp378x_devb.dts
rename to trunk/arch/arm/boot/dts/imx23-stmp378x_devb.dts
diff --git a/trunk/arch/arm/boot/dts/apx4devkit.dts b/trunk/arch/arm/boot/dts/imx28-apx4devkit.dts
similarity index 100%
rename from trunk/arch/arm/boot/dts/apx4devkit.dts
rename to trunk/arch/arm/boot/dts/imx28-apx4devkit.dts
diff --git a/trunk/arch/arm/boot/dts/cfa10036.dts b/trunk/arch/arm/boot/dts/imx28-cfa10036.dts
similarity index 100%
rename from trunk/arch/arm/boot/dts/cfa10036.dts
rename to trunk/arch/arm/boot/dts/imx28-cfa10036.dts
diff --git a/trunk/arch/arm/boot/dts/m28evk.dts b/trunk/arch/arm/boot/dts/imx28-m28evk.dts
similarity index 100%
rename from trunk/arch/arm/boot/dts/m28evk.dts
rename to trunk/arch/arm/boot/dts/imx28-m28evk.dts
diff --git a/trunk/arch/arm/boot/dts/tx28.dts b/trunk/arch/arm/boot/dts/imx28-tx28.dts
similarity index 100%
rename from trunk/arch/arm/boot/dts/tx28.dts
rename to trunk/arch/arm/boot/dts/imx28-tx28.dts
diff --git a/trunk/arch/arm/mach-mxs/Makefile.boot b/trunk/arch/arm/mach-mxs/Makefile.boot
index 58733cc0726b..4582999cf080 100644
--- a/trunk/arch/arm/mach-mxs/Makefile.boot
+++ b/trunk/arch/arm/mach-mxs/Makefile.boot
@@ -1,10 +1,10 @@
 zreladdr-y += 0x40008000
 
-dtb-y += apx4devkit.dtb \
-	 cfa10036.dtb \
-	 imx23-evk.dtb \
+dtb-y += imx23-evk.dtb \
 	 imx23-olinuxino.dtb \
+	 imx23-stmp378x_devb.dtb \
+	 imx28-apx4devkit.dtb \
+	 imx28-cfa10036.dtb \
 	 imx28-evk.dtb \
-	 m28evk.dtb \
-	 stmp378x_devb.dtb \
-	 tx28.dtb \
+	 imx28-m28evk.dtb \
+	 imx28-tx28.dtb \