aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorViresh Kumar <viresh.kumar@linaro.org>2013-02-15 22:43:15 +0530
committerViresh Kumar <viresh.kumar@linaro.org>2013-02-15 22:44:07 +0530
commit6ab7c9986cf271abd3564ec8e90ad48a4ff1d8b7 (patch)
treedc03a79641a070962630d882ebc9e65885af80d9
parent78a605361d8a23a444d5b1144678b96d35b3ffa0 (diff)
parent3633c1acf134ba8a26c8a1cb83afe9dd2b8be16a (diff)
parent839b1b3542746d25b03871a60db295bb1a2d99c6 (diff)
parent2879e357517574aebffae2448ae64a4da285590b (diff)
parent107feff1017607c614d4692d739c1a11de4c8a7f (diff)
parent011e29d3d389ec2b2f5f975869f7b663c87e16d1 (diff)
parent2730a7e0c51942b3aa3281ca8b53d632b7241735 (diff)
downloadvexpress-lsk-6ab7c9986cf271abd3564ec8e90ad48a4ff1d8b7.tar.gz
Merge branches 'arm-multi_pmu_v2', 'cpufreq-fixes-v3', 'hw-bkp-v7.1-debug-v2', 'task-placement-v2', 'task-placement-v2-sysfs', 'misc-patches' and 'config-fragments' into big-LITTLE-MP-master-v15big-LITTLE-MP-master-v15
Updates: ------- - Rebased over 3.8-rc7 - Stats: Total distinct patches: 37 - Dropped Patches: Two patches from cpufreq-fixes-v2 (3): causing some failures. - New Patches: One new patch into task-placement-v2 branch from Sudeep Commands used for merge: ----------------------- $ git checkout -b big-LITTLE-MP-master-v15 v3.8-rc7 $ git merge arm-multi_pmu_v2 cpufreq-fixes-v3 hw-bkp-v7.1-debug-v2 task-placement-v2 task-placement-v2-sysfs misc-patches config-fragments