diff options
| author | Viresh Kumar <viresh.kumar@linaro.org> | 2013-05-17 09:58:56 +0530 |
|---|---|---|
| committer | Viresh Kumar <viresh.kumar@linaro.org> | 2013-05-17 09:58:56 +0530 |
| commit | da143bac9131d9eb5bdcd1668a9f0c60304a9632 (patch) | |
| tree | 3ad098835b1d5cfe450b4c3a1220931df158bedf | |
| parent | d93d0c31d2d07f9bd659b13cfaa01f4b88f7e6f9 (diff) | |
| parent | 6d99f1fdc7d33f1017317984f5470446f5a920ad (diff) | |
| parent | 31fae8538ebb8464e48dd581d499fcf1ad72c7ad (diff) | |
| parent | a793696c574ed418607b31b34c5a9f62109e146f (diff) | |
| parent | bb0401ff6cdd8830bdc893a0f2b18c36d2c26b28 (diff) | |
| parent | a85f1a41f020bc2c97611060bcfae6f48a1db28d (diff) | |
Merge branches 'master-arm-multi_pmu_v2', 'master-config-fragments', 'master-hw-bkpt-fix', 'master-misc-patches', 'master-task-placement-v2-sysfs' and 'master-wq-migration-v5' into big-LITTLE-MP-master-v17tracking-big-LITTLE-MP-master-llct-20130625.0tracking-big-LITTLE-MP-master-llct-20130618.0tracking-big-LITTLE-MP-master-llct-20130617.1tracking-big-LITTLE-MP-master-llct-20130617.0tracking-big-LITTLE-MP-master-llct-20130613.0tracking-big-LITTLE-MP-master-llct-20130610.0tracking-big-LITTLE-MP-master-llct-20130606.0tracking-big-LITTLE-MP-master-llct-20130604.1tracking-big-LITTLE-MP-master-llct-20130604.0tracking-big-LITTLE-MP-master-llct-20130521.0tracking-big-LITTLE-MP-master-llct-20130518.0big-LITTLE-MP-master-v17
Updates:
-------
- Rebased over 3.10-rc1
- Stats: Total distinct patches: 41
- New Patches:
- master-wq-migration-v5: 5 (Already Applied for 3.11 by Tejun Heo)
- master-task-placement-v2: 2 from Chris
- master-task-placement-v2-sysfs: 1 from Chris
Commands used for merge:
-----------------------
$ git checkout -b big-LITTLE-MP-master-v17 v3.10-rc1
$ 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-wq-migration-v5