diff options
author | Viresh Kumar <viresh.kumar@linaro.org> | 2013-03-12 15:18:26 +0530 |
---|---|---|
committer | Viresh Kumar <viresh.kumar@linaro.org> | 2013-03-12 15:18:26 +0530 |
commit | 853725b2235c3df6f144be4b5391b99be6f9aeb4 (patch) | |
tree | d3b83104741fb508f996337bb21df8ee8ac890fa | |
parent | e29faff93713e9aba5077d590b11d035372f56ee (diff) | |
parent | 3a2e9fb39687153e86ebd022446c5b9b983265b3 (diff) | |
parent | 430219a653ec0e8bc2297db1a3402913bc2073b2 (diff) | |
parent | b52a8cfcf718262e408a41ff1e8d07e998f5037a (diff) |
Merge branches 'arm-multi_pmu_v2', 'task-placement-v2-sysfs', 'misc-patches' and 'config-fragments' into big-LITTLE-MP-master-v16tracking-big-LITTLE-MP-master-v16-llct-20130318.0tracking-big-LITTLE-MP-master-v16-llct-20130315.0tracking-big-LITTLE-MP-master-v16-llct-20130314.1tracking-big-LITTLE-MP-master-v16-llct-20130314.0tracking-big-LITTLE-MP-master-v16-llct-20130312.0
Updates:
-------
- Rebased over 3.9-rc2
- Stats: Total distinct patches: 32
- Dropped Patches:
- cpufreq-fixes-v3 branch, already upstreamed.
- hw-bkp-v7.1-debug-v2 branch, already upstreamed.
Commands used for merge:
-----------------------
$ git checkout -b big-LITTLE-MP-master-v16 v3.9-rc2
$ git merge arm-multi_pmu_v2 task-placement-v2 task-placement-v2-sysfs
misc-patches config-fragments