Merge remote-tracking branch 'lsk/linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Wed, 22 Jan 2014 15:31:30 +0000 (15:31 +0000)
committerMark Brown <broonie@linaro.org>
Wed, 22 Jan 2014 15:31:30 +0000 (15:31 +0000)
1  2 
kernel/sched/core.c

Simple merge