diff --git a/[refs] b/[refs]
index 82ebd2387488..0c3670c309a9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4796dd200db943e36f876e7029552212e5bbdf33
+refs/heads/master: fd0a37355c4d39affa39d5cd75168fb94b292318
diff --git a/trunk/lib/spinlock_debug.c b/trunk/lib/spinlock_debug.c
index 525d160d44f0..d0ec4f3d1593 100644
--- a/trunk/lib/spinlock_debug.c
+++ b/trunk/lib/spinlock_debug.c
@@ -58,7 +58,7 @@ static void spin_dump(raw_spinlock_t *lock, const char *msg)
 	printk(KERN_EMERG "BUG: spinlock %s on CPU#%d, %s/%d\n",
 		msg, raw_smp_processor_id(),
 		current->comm, task_pid_nr(current));
-	printk(KERN_EMERG " lock: %p, .magic: %08x, .owner: %s/%d, "
+	printk(KERN_EMERG " lock: %ps, .magic: %08x, .owner: %s/%d, "
 			".owner_cpu: %d\n",
 		lock, lock->magic,
 		owner ? owner->comm : "<none>",