diff options
| author | Viresh Kumar <viresh.kumar@linaro.org> | 2012-08-14 16:56:30 +0530 |
|---|---|---|
| committer | Viresh Kumar <viresh.kumar@linaro.org> | 2012-08-14 16:57:13 +0530 |
| commit | 6a1b927448144fe2fa7e28949cc54ea71bbe69d1 (patch) | |
| tree | 28057ff075e1d9bfdacf788792452d733157e65e | |
| parent | 88e36d1524af74074c41feb9a96b7522c688a781 (diff) | |
| parent | 95b65ed5cd57077be14cd55b26b676d1ffed5d0d (diff) | |
| parent | a773866c5219b43b82b482943dc376c6381c21c5 (diff) | |
| parent | d622fdaea9bb8a886a2f57dd50517afaac4dda90 (diff) | |
Merge branches 'arm-asymmetric-support-v3-v3.6-rc1', 'per-cpu-thread-hotplug-v3-fixed', 'fast-slow-cpu-dt-v1' and 'config-fragments' into big-LITTLE-MP-v5big-LITTLE-MP-v5
Rebased over: v3.6-rc1
Removed from this merge:
- cpuidle-next-v4 - Already in rc1
- wq-hotplug-v1 - Already in rc1
- arm-asymmetric-support-v3 - Only one patch not mailined others are dropped
$ gco -b big-LITTLE-MP-v5 v3.6-rc1
$ git merge arm-asymmetric-support-v3-v3.6-rc1 per-cpu-thread-hotplug-v3-fixed per-task-load-average-v2 task-placement-v1 fast-slow-cpu-dt-v1 config-fragments