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-v2
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