diff options
| author | Viresh Kumar <viresh.kumar@linaro.org> | 2012-11-20 11:10:28 +0530 |
|---|---|---|
| committer | Viresh Kumar <viresh.kumar@linaro.org> | 2012-11-20 12:58:51 +0530 |
| commit | aeef998694b0f1a1c1007289beaf406b130be061 (patch) | |
| tree | 685e92305c0568b820929f81df9452c2367e3606 | |
| parent | 993f3d3848630b312e3ff95f6c7a870dd97225dd (diff) | |
| parent | bb84ec16fc9ac705937100df83b61f33e2fbb679 (diff) | |
| parent | 6064a8cc97c6d21ba176a6a5567914b48cb21217 (diff) | |
| parent | 581add0ab10ce51b84235d34174f0a4e82fd398c (diff) | |
| parent | 680ab48373e58aa7c8d4c46aeb5c12bc8e65e09b (diff) | |
| parent | cb95eac8b0566afdb6dabdbdf46526509abbd013 (diff) | |
Merge branches 'arm-multi_pmu_v2', 'hw-bkp-v7.1-debug-v1', 'task-placement-v2', 'misc-patches', 'config-fragments' and 'sched-pack-small-tasks-v1' into big-LITTLE-MP-master-v12-v2big-LITTLE-MP-master-v12
Updates:
-------
- Based on v3.7-rc5
- Stats:
- Total Patches: 63
- New Patches: 1
- genirq: Add default affinity mask command line option in misc-patches branch
- top 3 patches in: sched-pack-small-tasks-v1
- top 3 patches in: task-placement-v2
- additional patch in: config-fragments
- Dropped patches/branches (as they are managed in experimental merge branch): 20
- patches in per-entity-load-tracking-with-core-sched-v1: 15
- Updated Patches: 0
Commands used for merge:
-----------------------
$ git checkout -b big-LITTLE-MP-master-v12 v3.7-rc5
$ git merge arm-multi_pmu_v2 hw-bkp-v7.1-debug-v1
per-task-load-average-v3-merged task-placement-v2 misc-patches
config-fragments sched-pack-small-tasks-v1
Conflicts:
kernel/sched/fair.c