path: root/include/linux
diff options
authorJon Medhurst <tixy@linaro.org>2013-07-18 11:49:27 +0100
committerJon Medhurst <tixy@linaro.org>2013-07-18 11:49:27 +0100
commita0e1bccdf9f1c4d68ea024e4254dbbd1eff96a4a (patch)
treef0f26c8bf385a8aeca435faaaf38d7dd0661e512 /include/linux
parent2443228c4c77ceb1193d8cf318118005a8c5fa5a (diff)
parent3231c8ce4b005f79ad27309907adc3de319e341c (diff)
parent8aa6a97721cc5146ee3e70cd477e10c4d0047d0c (diff)
parent7d252cd22a3f6cb459e8b012912dfd258157f7df (diff)
parent4ab2679351e9566a6b0822f2d841a902758ba066 (diff)
Merge branches 'master-arm-multi_pmu_v2', 'master-config-fragments', 'master-hw-bkpt-fix', 'master-misc-patches' and 'master-task-placement-v2-updates' into big-LITTLE-MP-master-v19
Updates: ------- - Rebased over 3.10 final - Differences from big-LITTLE-MP-master-v18 - New Patches: - master-config-fragments: 1 new patch - "config: Disable priority filtering for HMP Scheduler" - master-misc-patches: 1 new patch - "mm: make vmstat_update periodic run conditional" - New Branches: - master-task-placement-v2-updates: 7 patches New patches from ARM added in a new topic branch stacked on top of master-task-placement-v2-sysfs... - Revert "sched: Enable HMP priority filter by default" - "HMP: Use unweighted load for hmp migration decisions" - "HMP: Select least-loaded CPU when performing HMP Migrations" - "HMP: Avoid multiple calls to hmp_domain_min_load in fast path" - "HMP: Force new non-kernel tasks onto big CPUs until load stabilises" - "sched: Restrict nohz balance kicks to stay in the HMP domain" - "HMP: experimental: Force all rt tasks to start on little domain." Commands used for merge: ----------------------- $ git checkout -b big-LITTLE-MP-master-v19 v3.10 $ git merge master-arm-multi_pmu_v2 master-config-fragments \ master-hw-bkpt-fix master-misc-patches master-task-placement-v2 \ master-task-placement-v2-sysfs master-task-placement-v2-updates