Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

diff --cc drivers/cpufreq/cpufreq.c
Simple merge

diff --cc drivers/cpufreq/cpufreq_governor.c
index fafeb35146691fea567ffc92e9d48f7a157ba4ec,5af40ad82d231f7fd23bfd862590c30ab7d4b38e..b6cfd55d82669e340abbc7c2ce44549da25173da
--- 1/drivers/cpufreq/cpufreq_governor.c
--- 2/drivers/cpufreq/cpufreq_governor.c
+++ b/drivers/cpufreq/cpufreq_governor.c
@@@ -23,9 -23,9 +23,8 @@@
  #include <linux/kernel_stat.h>
  #include <linux/mutex.h>
  #include <linux/slab.h>
 -#include <linux/tick.h>
  #include <linux/types.h>
  #include <linux/workqueue.h>
- #include <linux/cpu.h>
  
  #include "cpufreq_governor.h"
  

diff --cc drivers/cpufreq/cpufreq_stats.c
index a276fb8a8c8f2bf80a0afb8c69f2e9ff97168f18,1db214b266088ba367a2af7fb3cfac116ec80a26..7dc9c4efbcfbcb8340295c59f8638eb5291aa9bc
--- 1/drivers/cpufreq/cpufreq_stats.c
--- 2/drivers/cpufreq/cpufreq_stats.c
+++ b/drivers/cpufreq/cpufreq_stats.c
@@@ -378,16 -358,9 +379,13 @@@ static int __cpuinit cpufreq_stat_cpu_c
                cpufreq_stats_free_sysfs(cpu);
                break;
        case CPU_DEAD:
-               cpufreq_stats_free_table(cpu);
-               break;
-       case CPU_UP_CANCELED_FROZEN:
-               cpufreq_stats_free_sysfs(cpu);
+       case CPU_DEAD_FROZEN:
                cpufreq_stats_free_table(cpu);
                break;
 +      case CPU_DOWN_FAILED:
 +      case CPU_DOWN_FAILED_FROZEN:
 +              cpufreq_stats_create_table_cpu(cpu);
 +              break;
        }
        return NOTIFY_OK;
  }

diff --cc kernel/printk.c
Simple merge

diff --cc kernel/trace/trace.c
Simple merge

diff --cc kernel/trace/trace.h
Simple merge