Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Tue, 8 Apr 2014 18:52:48 +0000 (19:52 +0100)
committerMark Brown <broonie@linaro.org>
Tue, 8 Apr 2014 18:52:48 +0000 (19:52 +0100)
1  2 
kernel/sched/core.c

Simple merge