diff options
| author | Viresh Kumar <viresh.kumar@linaro.org> | 2012-07-10 14:54:09 +0100 |
|---|---|---|
| committer | Viresh Kumar <viresh.kumar@linaro.org> | 2012-07-10 14:54:09 +0100 |
| commit | ccba94c19ef0aa96b8088b4c5021cb80515f71ab (patch) | |
| tree | 7e95d7256b9509ef160b19edfc49f8a8562f9fb5 | |
| parent | dd8081dd449a3dc83c0d44f3172360014915174d (diff) | |
| parent | e8102a1532b5b5c7bb936846d8354d219da5fdcd (diff) | |
| parent | 4860b997eb69f05ff49e5336dbd95dc508315f4c (diff) | |
| parent | 2f1229dfedff6b5894ef8bec7d735225d476d99c (diff) | |
| parent | 00fd9de8c2a3c7220b72b7d462203a83d7fde00c (diff) | |
Merge branches 'arm-asymmetric-support-v3', 'cpuidle-next-v4', 'per-cpu-thread-hotplug-v2', 'per-task-load-average-v1' and 'config-fragments' into big-LITTLE-MP-v1big-LITTLE-MP-v1
Based on v3.5-rc6
$ git checkout -b big-LITTLE-MP-v1 v3.5-rc6
$ git merge arm-asymmetric-support-v3 cpuidle-next-v4 per-cpu-thread-hotplug-v2 per-task-load-average-v1 config-fragments
Signed-off-by: Viresh Kumar <viresh.kumar@lianro.org>