2cbf335f8c
Steps on the way to v7.2-rc1 Resolves trivial merge conflicts in: kernel/sched/fair.c kernel/sched/sched.h Cc: John Stultz <jstultz@google.com> Change-Id: I49b142eba0e69f4a41425dae76f298c25c07dc68 Signed-off-by: Carlos Llamas <cmllamas@google.com>
d2ba6e9c0a
0923fd0419
1c3b68f0d5