Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Thu, 14 Aug 2014 13:22:49 +0000 (14:22 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 14 Aug 2014 13:22:49 +0000 (14:22 +0100)
commit862aa7107a86ad0f8597453625d6869b39b757dc
tree24a89e831527e58df3c11ab91de919f3465034d8
parent05e4e4a55c30aa5280b322dc87c82e796b83ffe9
parent5b70260e8f6bf80def50b2126e2ded2cb8e32012
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
include/linux/sched.h
kernel/sched/core.c