Merge tag 'v3.10.14' into linux-linaro-lsk
authorMark Brown <broonie@linaro.org>
Thu, 3 Oct 2013 23:30:17 +0000 (00:30 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 3 Oct 2013 23:30:17 +0000 (00:30 +0100)
This is the 3.10.14 stable release

1  2 
kernel/sched/fair.c

Simple merge