Merge branch 'intel' into android-4.0

diff --cc arch/x86/kernel/cpu/intel.c
index ae2ab91,cef2a4d..89a7e14
--- 1/arch/x86/kernel/cpu/intel.c
--- 2/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
@@@ -95,10 -95,9 +95,11 @@@ static void early_init_intel(struct cpu
        /* Penwell and Cloverview have the TSC which doesn't sleep on S3 */
        if (c->x86 == 6) {
                switch (c->x86_model) {
 +              case 0x37:      /* ValleyView */
 +                      set_cpu_cap(c, X86_FEATURE_TSC_RELIABLE);
                case 0x27:      /* Penwell */
                case 0x35:      /* Cloverview */
+               case 0x4A:      /* Merrifield */
                        set_cpu_cap(c, X86_FEATURE_NONSTOP_TSC_S3);
                        break;
                default:

diff --cc drivers/android/binder.c
Simple merge