diff options
| author | Viresh Kumar <viresh.kumar@linaro.org> | 2013-04-03 13:39:42 +0530 |
|---|---|---|
| committer | Viresh Kumar <viresh.kumar@linaro.org> | 2013-04-03 13:39:42 +0530 |
| commit | 6a610f223c0e9d2f7c102dac7b936cccc6476e0d (patch) | |
| tree | 391acab7b6e292384454ea37616dcbabd43400a7 /Makefile | |
| parent | 9a379826b40b6b9197898471c93271d1b7b6b191 (diff) | |
| parent | 56f2c5357692853ea09b7172fa203b9ede0c99fa (diff) | |
Merge branch 'upstream-runnable-load-avg-in-load-balance-v2' into big-LITTLE-MP-upstream-v2
Conflicts:
include/linux/sched.h
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions