Merge tag 'imx-defconfig' of git://git.pengutronix.de/git/imx/linux-2.6 into next/defconfig

From Sascha Hauer <s.hauer@pengutronix.de>:

ARM i.MX defconfig updates for v3.6

* tag 'imx-defconfig' of git://git.pengutronix.de/git/imx/linux-2.6:
  ARM: imx_v4_v5_defconfig: update features
  ARM: imx_v6_v7_defconfig: update features

Includes an update to v3.5-rc5

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

1 files changed, 1 insertions, 1 deletions

diff --git a/lib/spinlock_debug.c b/lib/spinlock_debug.c
index d0ec4f3d1593..e91fbc23fff1 100644
--- a/lib/spinlock_debug.c
+++ b/lib/spinlock_debug.c
@@ -118,7 +118,7 @@ static void __spin_lock_debug(raw_spinlock_t *lock)
                 /* lockup suspected: */
                 if (print_once) {
                         print_once = 0;
-                        spin_dump(lock, "lockup");
+                        spin_dump(lock, "lockup suspected");
 #ifdef CONFIG_SMP
                         trigger_all_cpu_backtrace();
 #endif