diff options
author | Viresh Kumar <viresh.kumar@linaro.org> | 2012-11-05 15:11:02 +0530 |
---|---|---|
committer | Viresh Kumar <viresh.kumar@linaro.org> | 2012-11-05 15:11:02 +0530 |
commit | 0c44ec0c38e97e404d0f9921f5cbeb7deb1dfc8b (patch) | |
tree | 1324451d5621bbbbb406c0bbc745807645b0442e | |
parent | d7a04d9b376d2983fbc110b3e8c46889edc96f2b (diff) | |
parent | b9bfccfdef839ac23e420117e8a9d74e0b56819d (diff) | |
parent | ceb23d19242e4ced89a2e670a4fcb44f5fcf6238 (diff) | |
parent | 9d6ace1492b2ed9b6a204e5b36c27d5cd5903ad2 (diff) | |
parent | 67f9c45df8580b2d3aa2645881186b082dc38ff9 (diff) | |
parent | 6838e919a53b95590a65ff4dad08cd1e95327b1d (diff) |
Merge branches 'arm-multi_pmu_v2', 'hw-bkp-v7.1-debug-v1', 'task-placement-v2', 'per-entity-load-tracking-with-core-sched-v1', 'config-fragments' and 'sched-pack-small-tasks-v1' into big-LITTLE-MP-v11big-LITTLE-MP-v11
Updates:
-------
- Based on v3.7-rc3
- Stats:
- Total Patches: 70
- New Patches: 22
- per-task-load-average-v3-merged: 1 by Peter Z.
- per-entity-load-tracking-with-core-sched-v1: 15 by Preeti
- sched-pack-small-tasks-v1:6 by Vincent
- Dropped patches/branches (as they are already merged in 3.7): 24
- arm-asymmetric-support-v3-v3.6-rc1: 1
- per-cpu-thread-hotplug-v3-fixed: 8
- rcu-hotplug-v1: 4
- scheduler-misc-v1: 1
- arm-multi_pmu_v2: 10 (out of 24 merged)
- Updated Patches: 16
- per-task-load-average-v3-merged updated with patches applied to sched/core tip
Commands used for merge:
-----------------------
$ git checkout -b big-LITTLE-MP-v11 v3.7-rc3
$ git merge arm-multi_pmu_v2 hw-bkp-v7.1-debug-v1
per-task-load-average-v3-merged task-placement-v2
per-entity-load-tracking-with-core-sched-v1 config-fragments
sched-pack-small-tasks-v1
Conflicts:
kernel/sched/fair.c