Merge remote-tracking branch 'stable/linux-3.10.y' into linux-linaro-lsk
authorAlex Shi <alex.shi@linaro.org>
Sun, 22 Dec 2013 03:12:04 +0000 (11:12 +0800)
committerAlex Shi <alex.shi@linaro.org>
Sun, 22 Dec 2013 03:12:04 +0000 (11:12 +0800)
commit3c6556b1a9c2f9c91aacbc57bac938691fedda81
treeec95f19f5ed70514a148720429c7926a52a366c5
parentb8420132aa326738c0139b85a65f9fc12764570d
parent095f493c4d532b0ced3aee22e2d5b2cea02aa773
Merge remote-tracking branch 'stable/linux-3.10.y' into linux-linaro-lsk
kernel/sched/debug.c
kernel/sched/fair.c