diff --git a/[refs] b/[refs]
index a0751981464b..242e27935ea7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0b4184c26b18ecbc0ec0657f514b087c3a6216fb
+refs/heads/master: 164c013858a2e89b450cd8021a8be896f9e05697
diff --git a/trunk/arch/metag/configs/meta1_defconfig b/trunk/arch/metag/configs/meta1_defconfig
index c35a75e8ecfe..01cd67e4403d 100644
--- a/trunk/arch/metag/configs/meta1_defconfig
+++ b/trunk/arch/metag/configs/meta1_defconfig
@@ -1,6 +1,5 @@
 # CONFIG_LOCALVERSION_AUTO is not set
 # CONFIG_SWAP is not set
-CONFIG_LOG_BUF_SHIFT=13
 CONFIG_SYSFS_DEPRECATED=y
 CONFIG_SYSFS_DEPRECATED_V2=y
 CONFIG_KALLSYMS_ALL=y
diff --git a/trunk/arch/metag/configs/meta2_defconfig b/trunk/arch/metag/configs/meta2_defconfig
index fb3148410183..643392ba7ed5 100644
--- a/trunk/arch/metag/configs/meta2_defconfig
+++ b/trunk/arch/metag/configs/meta2_defconfig
@@ -1,7 +1,6 @@
 # CONFIG_LOCALVERSION_AUTO is not set
 # CONFIG_SWAP is not set
 CONFIG_SYSVIPC=y
-CONFIG_LOG_BUF_SHIFT=13
 CONFIG_SYSFS_DEPRECATED=y
 CONFIG_SYSFS_DEPRECATED_V2=y
 CONFIG_KALLSYMS_ALL=y
diff --git a/trunk/arch/metag/configs/meta2_smp_defconfig b/trunk/arch/metag/configs/meta2_smp_defconfig
index 6c7b777ac276..f3306737da20 100644
--- a/trunk/arch/metag/configs/meta2_smp_defconfig
+++ b/trunk/arch/metag/configs/meta2_smp_defconfig
@@ -1,7 +1,6 @@
 # CONFIG_LOCALVERSION_AUTO is not set
 # CONFIG_SWAP is not set
 CONFIG_SYSVIPC=y
-CONFIG_LOG_BUF_SHIFT=13
 CONFIG_SYSFS_DEPRECATED=y
 CONFIG_SYSFS_DEPRECATED_V2=y
 CONFIG_KALLSYMS_ALL=y