diff options
author | Daniel Lezcano <daniel.lezcano@linaro.org> | 2014-11-20 15:07:41 +0100 |
---|---|---|
committer | Daniel Lezcano <daniel.lezcano@linaro.org> | 2014-11-20 15:07:41 +0100 |
commit | b9ed965defe8f8ee2e57e0a9372c70b883a4ea3f (patch) | |
tree | 4c72d3a7bc6bd00229bce96b932626f5bb687434 /scripts | |
parent | 5f0dea804d380d0fa57c0f69a8e961b058be998f (diff) | |
parent | 7c2684baf9042237fa3f72c9f230637911fe9b53 (diff) |
Merge remote-tracking branch 'eas-next/eas-next' into sched/cpuidle/eas-nexteas-next-20141120sched/cpuidle/eas-next
Conflicts:
include/linux/sched.h
kernel/sched/Makefile
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions