diff options
author | Viresh Kumar <viresh.kumar@linaro.org> | 2013-01-13 09:57:30 +0530 |
---|---|---|
committer | Viresh Kumar <viresh.kumar@linaro.org> | 2013-01-13 09:57:30 +0530 |
commit | cf2f6290d0f9a94bc309a74f5500f7be144c0d36 (patch) | |
tree | 0e8af8bfa1a761f45bd419354645c962ca7459f9 | |
parent | d93f3815580c3705dd066410dfb55907508881b5 (diff) | |
parent | c8858f2e2768be94901696e5fc208efe9104b26e (diff) | |
parent | a59eed9aca511151189f929f9cc7fc694fe76718 (diff) | |
parent | ba73f845d972111cbbe7d54f4fdd52d1c37f9547 (diff) | |
parent | fc3fb1620ac94186b7804b6da4fddee4bc88048b (diff) | |
parent | 6709bd55bd516bdca551b03357bf64b7503c7cd6 (diff) | |
parent | 3339fbd0ebb3dc9854b7e71ffc510aa676837a9f (diff) |
Merge branches 'arm-multi_pmu_v2', 'cpufreq-fixes-v2', 'hw-bkp-v7.1-debug-v2', 'task-placement-v2-sysfs', 'misc-patches', 'config-fragments' and 'sched-pack-small-tasks-v2' into big-LITTLE-MP-master-v14tracking-big-LITTLE-MP-master-v14-llct-20130121.1tracking-big-LITTLE-MP-master-v14-llct-20130121.0tracking-big-LITTLE-MP-master-v14-llct-20130115.0tracking-big-LITTLE-MP-master-v14-llct-20130114.0
Updates:
-------
- Rebased over 3.8-rc2
- per-task-load-average-v3-merged dropped as its already present in 3.8-rc2
- sched-pack-small-tasks-v1-fixed and sched-pack-small-tasks-v1-arm dropped, as
sched-pack-small-tasks-v2 contains all required patches.
- Few patches from arm-multi_pmu_v2 dropped as they are already mainlined.
- Stats: Total distinct patches: 43
- New Patches: cpufreq-fixes-v2 (5)
Commands used for merge:
-----------------------
$ git checkout -b big-LITTLE-MP-master-v14 v3.8-rc2
$ git merge arm-multi_pmu_v2 cpufreq-fixes-v2 hw-bkp-v7.1-debug-v2
task-placement-v2 task-placement-v2-sysfs misc-patches config-fragments
sched-pack-small-tasks-v2
Conflicts:
kernel/sched/fair.c