Merge remote-tracking branch 'stable/linux-3.10.y' into linux-linaro-lsk

diff --cc kernel/sched/debug.c
index 6b7b86cfabad1d08a39ef147ee772d72aacd031e,e745a154836703bc3bd3980ba5adb1651ebf50f7..c2665cd29594aa573bb85c9f39a4d0db6e658930
--- 1/kernel/sched/debug.c
--- 2/kernel/sched/debug.c
+++ b/kernel/sched/debug.c
@@@ -224,9 -223,15 +224,17 @@@ void print_cfs_rq(struct seq_file *m, i
                        cfs_rq->tg_runnable_contrib);
        SEQ_printf(m, "  .%-30s: %d\n", "tg->runnable_avg",
                        atomic_read(&cfs_rq->tg->runnable_avg));
 +      SEQ_printf(m, "  .%-30s: %d\n", "tg->usage_avg",
 +                      atomic_read(&cfs_rq->tg->usage_avg));
  #endif
+ #ifdef CONFIG_CFS_BANDWIDTH
+       SEQ_printf(m, "  .%-30s: %d\n", "tg->cfs_bandwidth.timer_active",
+                       cfs_rq->tg->cfs_bandwidth.timer_active);
+       SEQ_printf(m, "  .%-30s: %d\n", "throttled",
+                       cfs_rq->throttled);
+       SEQ_printf(m, "  .%-30s: %d\n", "throttle_count",
+                       cfs_rq->throttle_count);
+ #endif
  
        print_cfs_group_stats(m, cpu, cfs_rq->tg);
  #endif

diff --cc kernel/sched/fair.c
Simple merge