Merge branch 'master' into for-2.6.31

Conflicts:
	drivers/block/hd.c
	drivers/block/mg_disk.c

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
index 18dfa30795c9..b79c5533c421 100644
--- a/arch/x86/kernel/ftrace.c
+++ b/arch/x86/kernel/ftrace.c
@@ -442,7 +442,7 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr)
                 _ASM_EXTABLE(1b, 4b)
                 _ASM_EXTABLE(2b, 4b)
 
-                : [old] "=r" (old), [faulted] "=r" (faulted)
+                : [old] "=&r" (old), [faulted] "=r" (faulted)
                 : [parent] "r" (parent), [return_hooker] "r" (return_hooker)
                 : "memory"
         );