Merge branch 'linus' into core/generic-dma-coherent

Conflicts:

	arch/x86/Kconfig

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 1 insertions, 1 deletions

diff --git a/kernel/power/process.c b/kernel/power/process.c
index 5fb87652f214..278946aecaf0 100644
--- a/kernel/power/process.c
+++ b/kernel/power/process.c
@@ -149,7 +149,7 @@ static int try_to_freeze_tasks(bool sig_only)
         unsigned long end_time;
         unsigned int todo;
         struct timeval start, end;
-        s64 elapsed_csecs64;
+        u64 elapsed_csecs64;
         unsigned int elapsed_csecs;
 
         do_gettimeofday(&start);