Merge commit 'v2.6.28-rc2' into tracing/urgent

1 files changed, 0 insertions, 2 deletions

diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c
index 65ad925c3a8f..c6a8f2326b6f 100644
--- a/arch/powerpc/kernel/signal_64.c
+++ b/arch/powerpc/kernel/signal_64.c
@@ -235,8 +235,6 @@ static long restore_sigcontext(struct pt_regs *regs, sigset_t *set, int sig,
         else
                 for (i = 0; i < 32 ; i++)
                         current->thread.fpr[i][TS_VSRLOWOFFSET] = 0;
-
-#else
 #endif
         return err;
 }