From 6502ac47a6a2b78227423df352095821e7233e4d Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 3 May 2012 12:47:54 +0000
Subject: [PATCH] --- yaml --- r: 321539 b: refs/heads/master c:
 15b5eb2d913f857ad30b0b4f1cd6867495962221 h: refs/heads/master i:   321537:
 dd0faabc824114b0422c1928bd353f2032df305d   321535:
 695fbece37b82e09342dc3d0411b86d5532742a0 v: v3

---
 [refs]                                      | 2 +-
 trunk/arch/arm/configs/tct_hammer_defconfig | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7485b43eb766..56e69f99621b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b64456a4fc9b91c55c5eb84fc98ecf28a88f9bd0
+refs/heads/master: 15b5eb2d913f857ad30b0b4f1cd6867495962221
diff --git a/trunk/arch/arm/configs/tct_hammer_defconfig b/trunk/arch/arm/configs/tct_hammer_defconfig
index 1d24f8458bef..71277a1591ba 100644
--- a/trunk/arch/arm/configs/tct_hammer_defconfig
+++ b/trunk/arch/arm/configs/tct_hammer_defconfig
@@ -7,7 +7,7 @@ CONFIG_SYSFS_DEPRECATED_V2=y
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_EXPERT=y
 # CONFIG_KALLSYMS is not set
-# CONFIG_BUG is not set
+# CONFIG_BUGVERBOSE is not set
 # CONFIG_ELF_CORE is not set
 # CONFIG_SHMEM is not set
 CONFIG_SLOB=y