tree d0edd1065ee10369ca204404e43bdeece71d3d5e
parent c1776a18e3b5a3559f3dff5df0ecce570abd3a9f
parent 397f2378f136128623fc237746157aa2564d1082
author Linus Torvalds <torvalds@linux-foundation.org> 1436025413 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1436025413 -0700

Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull scheduler fixes from Ingo Molnar:
 "Debug info and other statistics fixes and related enhancements"

* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched/numa: Fix numa balancing stats in /proc/pid/sched
  sched/numa: Show numa_group ID in /proc/sched_debug task listings
  sched/debug: Move print_cfs_rq() declaration to kernel/sched/sched.h
  sched/stat: Expose /proc/pid/schedstat if CONFIG_SCHED_INFO=y
  sched/stat: Simplify the sched_info accounting dependency