Merge 3.14-rc5 into driver-core-next

We want the fixes in here.
2014-03-02 20:09:08 -08:00
parent 6d8b3e1ad3 0414855fdc
commit 13df797743
530 changed files with 5366 additions and 3343 deletions
--- a/arch/x86/include/asm/tsc.h
+++ b/arch/x86/include/asm/tsc.h
@@ -66,6 +66,6 @@ extern void tsc_save_sched_clock_state(void);
 extern void tsc_restore_sched_clock_state(void);

 /* MSR based TSC calibration for Intel Atom SoC platforms */
-int try_msr_calibrate_tsc(unsigned long *fast_calibrate);
+unsigned long try_msr_calibrate_tsc(void);

 #endif /* _ASM_X86_TSC_H */