]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'sched-idle-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 2 Apr 2014 23:22:27 +0000 (16:22 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 2 Apr 2014 23:22:27 +0000 (16:22 -0700)
commit05bf58ca4b8f0be7d7af830f943f6d6b2c9ccee1
tree9c87f7ffb9bbd2d54dd1e3bbfd8ef4eaeec8063b
parentd23082257d83e4bc89727d5aedee197e907999d2
parenta1d028bd6d2b7789d15eddfd07c5bea2aaf36040
Merge branch 'sched-idle-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull sched/idle changes from Ingo Molnar:
 "More idle code reorganization, to prepare for more integration.

  (Sent separately because it depended on pending timer work, which is
  now upstream)"

* 'sched-idle-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched/idle: Add more comments to the code
  sched/idle: Move idle conditions in cpuidle_idle main function
  sched/idle: Reorganize the idle loop
  cpuidle/idle: Move the cpuidle_idle_call function to idle.c
  idle/cpuidle: Split cpuidle_idle_call main function into smaller functions
drivers/cpuidle/cpuidle.c