diff options
| author | Viresh Kumar <viresh.kumar@linaro.org> | 2012-07-11 10:19:23 +0100 |
|---|---|---|
| committer | Viresh Kumar <viresh.kumar@linaro.org> | 2012-07-11 10:51:29 +0100 |
| commit | ca789c61deb0219cd3fefdb26090bbc9701deada (patch) | |
| tree | 1b135e0970cb813529848a69accaa9488cec7a58 | |
| parent | dd8081dd449a3dc83c0d44f3172360014915174d (diff) | |
| parent | e8102a1532b5b5c7bb936846d8354d219da5fdcd (diff) | |
| parent | 4860b997eb69f05ff49e5336dbd95dc508315f4c (diff) | |
| parent | c683b9db7fffe1d24a67c2f2544ec27c0c43bc40 (diff) | |
| parent | cd5b11b15a4c9e142944668ce6efc44e261e9665 (diff) | |
Merge branches 'arm-asymmetric-support-v3', 'cpuidle-next-v4', 'per-cpu-thread-hotplug-v2', 'task-placement-v1' and 'config-fragments' into big-LITTLE-MP-v3big-LITTLE-MP-v2
Based on v3.5-rc6
$ git checkout -b big-LITTLE-MP-v3 v3.5-rc6
$ git merge arm-asymmetric-support-v3 cpuidle-next-v4 per-cpu-thread-hotplug-v2 per-task-load-average-v2 task-placement-v1 config-fragments