Merge remote-tracking branch 'stable/linux-3.10.y' 3.10.27 into linux-linaro-lsk

diff --cc kernel/sched/core.c
Simple merge

diff --cc kernel/sched/fair.c
Simple merge

diff --cc kernel/sched/sched.h
Simple merge