diff --git a/[refs] b/[refs]
index 04ac50d6de00..1fe792550b64 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 43b39f9f040fd49a094222f70857e3690ce653a3
+refs/heads/master: 2012e49e8ad4ae432cf1667e945b0f335c3e6d38
diff --git a/trunk/arch/arm/mach-msm/Makefile b/trunk/arch/arm/mach-msm/Makefile
index 0cb523fe3b3e..86bad4f0dc7b 100644
--- a/trunk/arch/arm/mach-msm/Makefile
+++ b/trunk/arch/arm/mach-msm/Makefile
@@ -7,4 +7,4 @@ obj-y += clock.o clock-7x01a.o
 
 obj-$(CONFIG_MACH_HALIBUT) += board-halibut.o
 
-obj-$(CONFIG_MACH_TROUT) += board-dream.o
+obj-$(CONFIG_MACH_TROUT) += board-trout.o
diff --git a/trunk/arch/arm/mach-msm/board-dream.c b/trunk/arch/arm/mach-msm/board-trout.c
similarity index 97%
rename from trunk/arch/arm/mach-msm/board-dream.c
rename to trunk/arch/arm/mach-msm/board-trout.c
index 21afa8513168..9793ff45deb4 100644
--- a/trunk/arch/arm/mach-msm/board-dream.c
+++ b/trunk/arch/arm/mach-msm/board-trout.c
@@ -1,4 +1,4 @@
-/* linux/arch/arm/mach-msm/board-dream.c
+/* linux/arch/arm/mach-msm/board-trout.c
  *
  * Copyright (C) 2009 Google, Inc.
  * Author: Brian Swetland <swetland@google.com>
@@ -28,7 +28,7 @@
 #include <mach/msm_iomap.h>
 
 #include "devices.h"
-#include "board-dream.h"
+#include "board-trout.h"
 
 static struct platform_device *devices[] __initdata = {
 	&msm_device_uart3,
diff --git a/trunk/arch/arm/mach-msm/board-dream.h b/trunk/arch/arm/mach-msm/board-trout.h
similarity index 100%
rename from trunk/arch/arm/mach-msm/board-dream.h
rename to trunk/arch/arm/mach-msm/board-trout.h