| commit | 21bd85cd954df71c2b97df44b42ea8c488515ea9 | [log] [tgz] |
|---|---|---|
| author | Quentin Perret <quentin.perret@arm.com> | Thu Feb 22 16:25:03 2018 +0000 |
| committer | Quentin Perret <quentin.perret@arm.com> | Thu Feb 22 18:04:18 2018 +0000 |
| tree | fb7aab81d4237cd8bc9184032ff6cd6108dd29c1 | |
| parent | b5ba569f6f894078248ebc4bd27e44af95d90786 [diff] | |
| parent | 7595d550012d4a0b4b1fb40547495259a3674dc4 [diff] |
Merge remote-tracking branch 'android-4.9' into 'android-4.9-eas-dev'
Fixed merge conflicts caused by 8a174b4749d3 ("sched/fair: prevent
possible infinite loop in sched_group_energy)
Change-Id: Iba35631a213b88f6361838f28573af3407568919
Signed-off-by: Quentin Perret <quentin.perret@arm.com>