Merge "ARM: mm: Remove SW emulation for ARM domain manager" into cm-10.2
Merge "freezer: define try_to_freeze_nowarn if CONFIG_FREEZER=n" into cm-10.2
Merge "mm: remove swap token code" into cm-10.2
Merge "mm: add a field to store names for private anonymous memory" into cm-10.2
Merge "ARM: kgdb: ignore breakpoint instructions from user mode" into cm-10.2
Merge "sched: provide per cpu-cgroup option to notify on migrations" into cm-10.2
Merge "sched: remove migration notification from RT class" into cm-10.2
Merge "sched: re-calculate a cpu's next_balance point upon sched domain changes" into cm-10.2
Merge "msm: cpufreq: sync with upstream msm-3.4" into cm-10.2
Conflicts:
	drivers/cpufreq/cpufreq_ondemand.c
Merge "trace: power: Adding trace events for cpufreq" into cm-10.2
Merge changes If8a4a399,I392832e2,I8543974a into cm-10.2

* changes:
  sched: Unthrottle rt runqueues in __disable_runtime()
  sched: change WARN_ON_ONCE to WARN_ON in try_to_wake_up_local()
  sched: Make sure to not re-read variables after validation