aboutsummaryrefslogtreecommitdiff
path: root/Kbuild
diff options
context:
space:
mode:
authorViresh Kumar <viresh.kumar@linaro.org>2012-10-12 14:12:58 +0530
committerViresh Kumar <viresh.kumar@linaro.org>2012-10-12 14:14:20 +0530
commit2027d925f44d49835beff1b4917d8fd91f8805d7 (patch)
tree19cd25d43f647d200fec6ddc87d8ff047479b413 /Kbuild
parentf97b525a9fb87b57a751cab4909a9a495463d8af (diff)
parent2e91a21772260ab89fc7b30c535233b2641520d8 (diff)
parent433c390d9df85d616b37e0cd9fa302303d944b62 (diff)
parent1090c1ac962ba705d49dcdc52ab547cc38c0b77f (diff)
parentbd7fc4c65bd8ed994ded5aa0feeef91190fbd7be (diff)
parent6e070a6118f052ebca2490eff68202897534f241 (diff)
parent59aea69eeb2fa9cb1870e2f15db4763dab757408 (diff)
parent67f9c45df8580b2d3aa2645881186b082dc38ff9 (diff)
downloadvexpress-lsk-2027d925f44d49835beff1b4917d8fd91f8805d7.tar.gz
Merge branches 'per-cpu-thread-hotplug-v3-fixed', 'task-placement-v2', 'arm-asymmetric-support-v3-v3.6-rc1', 'rcu-hotplug-v1', 'arm-multi_pmu_v2', 'scheduler-misc-v1', 'hw-bkp-v7.1-debug-v1' and 'config-fragments' into big-LITTLE-MP-v10
Updates: ------- - Based on v3.6 - Stats: - Total Patches: 77 (V9 had incorrect count) - New Patches: 7 - task-placement-v2: sched: Enable HMP priority filter by default - arm-multi_pmu_v2 updated existing patches: http://permalink.gmane.org/gmane.linux.linaro.devel/13707 - hw-bkp-v7.1-debug-v1: new branch (1 patch) - Dropped Patches: 2 - branch cpu-hotplug-get_online_cpus-v1 removed as patches are already there in rcu-hotplug-v1 - Updated Patches: - per-task-load-average-v3-fixed updated with minor fixes. from: git://git.kernel.org/pub/scm/linux/kernel/git/pjt/sched.git commands used for merge: ----------------------- $ git checkout -b big-LITTLE-MP-v10 v3.6 $ git merge per-cpu-thread-hotplug-v3-fixed per-task-load-average-v3-fixed task-placement-v2 arm-asymmetric-support-v3-v3.6-rc1 rcu-hotplug-v1 arm-multi_pmu_v2 scheduler-misc-v1 hw-bkp-v7.1-debug-v1 config-fragments