diff --git a/[refs] b/[refs]
index dd3fd4d781aa..41db520c54d8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 72e9622c2a2eb73d82c716504cc93d22cd3cfd8e
+refs/heads/master: 2fd36a5d6e830269a37f0f6ccfd34ee0517ebc7d
diff --git a/trunk/arch/arm/configs/corgi_defconfig b/trunk/arch/arm/configs/corgi_defconfig
index f3af0b593eb0..98765438048d 100644
--- a/trunk/arch/arm/configs/corgi_defconfig
+++ b/trunk/arch/arm/configs/corgi_defconfig
@@ -179,7 +179,7 @@ CONFIG_MACH_HUSKY=y
 # CONFIG_MACH_AKITA is not set
 # CONFIG_MACH_SPITZ is not set
 # CONFIG_MACH_BORZOI is not set
-CONFIG_MACH_TOSA=y
+# CONFIG_MACH_TOSA is not set
 # CONFIG_ARCH_VIPER is not set
 # CONFIG_ARCH_PXA_ESERIES is not set
 # CONFIG_TRIZEPS_PXA is not set