aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorViresh Kumar <viresh.kumar@linaro.org>2012-10-03 16:29:42 +0530
committerViresh Kumar <viresh.kumar@linaro.org>2012-10-03 16:29:42 +0530
commit619245dc532b1d1b59cd414ae4d87e9b3ae42c65 (patch)
tree3704c93f040d025800d2488339ea65b62111d651
parentf97b525a9fb87b57a751cab4909a9a495463d8af (diff)
parent2fb7ed177f3d0487c4e953d4c217b136fc17e812 (diff)
parent517ddd9e74294e42166161114226f3315c8d1376 (diff)
parent433c390d9df85d616b37e0cd9fa302303d944b62 (diff)
parent1090c1ac962ba705d49dcdc52ab547cc38c0b77f (diff)
parent6e1dbc3ffb38049299d9621e795b116aa878cd52 (diff)
parent6e070a6118f052ebca2490eff68202897534f241 (diff)
parentc6617199117105f771463be72e69017303c9fe54 (diff)
downloadvexpress-lsk-619245dc532b1d1b59cd414ae4d87e9b3ae42c65.tar.gz
Merge branches 'per-cpu-thread-hotplug-v3-fixed', 'task-placement-v2', 'cpu-hotplug-get_online_cpus-v1', 'arm-asymmetric-support-v3-v3.6-rc1', 'rcu-hotplug-v1', 'arm-multi_pmu_v1', 'scheduler-misc-v1' and 'config-fragments' into big-LITTLE-MP-v9big-LITTLE-MP-v9
Updates: ------- - Based on v3.6 - Stats: - Total Patches: 63 - New Patches: 0 - Merged Patches: 3 - f319da0 sched: Fix load avg vs cpu-hotplug - 641f145 hwmon: (coretemp) Use get_online_cpus to avoid races involving CPU hotplug - 1ec3ddf hwmon: (via-cputemp) Use get_online_cpus to avoid races involving CPU hotplug - Dropped Patches: 0 commands used for merge: ----------------------- $ git checkout -b big-LITTLE-MP-v9 v3.6 $ git merge per-cpu-thread-hotplug-v3-fixed per-task-load-average-v3 task-placement-v2 cpu-hotplug-get_online_cpus-v1 arm-asymmetric-support-v3-v3.6-rc1 rcu-hotplug-v1 arm-multi_pmu_v1 scheduler-misc-v1 config-fragments