aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorViresh Kumar <viresh.kumar@linaro.org>2013-01-23 17:24:03 +0530
committerViresh Kumar <viresh.kumar@linaro.org>2013-01-23 17:24:03 +0530
commit56a331912166f0f618f0c0cf633c87967fe487c0 (patch)
treea57e6bf2d77f0b16e3ef349fa3a215a97398e6bb
parentd93f3815580c3705dd066410dfb55907508881b5 (diff)
parentc8858f2e2768be94901696e5fc208efe9104b26e (diff)
parenta59eed9aca511151189f929f9cc7fc694fe76718 (diff)
parentba73f845d972111cbbe7d54f4fdd52d1c37f9547 (diff)
parentfc3fb1620ac94186b7804b6da4fddee4bc88048b (diff)
parent6709bd55bd516bdca551b03357bf64b7503c7cd6 (diff)
downloadvexpress-lsk-56a331912166f0f618f0c0cf633c87967fe487c0.tar.gz
Merge branches 'arm-multi_pmu_v2', 'cpufreq-fixes-v2', 'hw-bkp-v7.1-debug-v2', 'task-placement-v2-sysfs', 'misc-patches' and 'config-fragments' into big-LITTLE-MP-master-v14big-LITTLE-MP-master-v14
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. Even sched-pack-small-tasks-v2 is dropped at last moment due to some issues. - Few patches from arm-multi_pmu_v2 dropped as they are already mainlined. - Stats: Total distinct patches: 37 - 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