Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Thu, 15 May 2014 15:56:03 +0000 (16:56 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 15 May 2014 15:56:03 +0000 (16:56 +0100)
1  2 
kernel/sched/core.c

Simple merge