tree c0b305c494ed32df711c576d9dbd78c8cb394654
parent 9d55ab71b735621a63c8923ba934d87879847cef
parent 301a5cba2887d1f640e6d5184b05a6d7132017d5
author Linus Torvalds <torvalds@linux-foundation.org> 1350047585 +0900
committer Linus Torvalds <torvalds@linux-foundation.org> 1350047585 +0900

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

Pull scheduler fixes from Ingo Molnar:
 "A CPU hotplug related crash fix and a nohz accounting fixlet."

* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched: Update sched_domains_numa_masks[][] when new cpus are onlined
  sched: Ensure 'sched_domains_numa_levels' is safe to use in other functions
  nohz: Fix one jiffy count too far in idle cputime