Linus Torvalds 0b981cb94b Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip ... Pull scheduler changes from Ingo Molnar: "Continued quest to clean up and enhance the cputime code by Frederic Weisbecker, in preparation for future tickless kernel features. Other than that, smallish changes." Fix up trivial conflicts due to additions next to each other in arch/{x86/}Kconfig * 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (24 commits) cputime: Make finegrained irqtime accounting generally available cputime: Gather time/stats accounting config options into a single menu ia64: Reuse system and user vtime accounting functions on task switch ia64: Consolidate user vtime accounting vtime: Consolidate system/idle context detection cputime: Use a proper subsystem naming for vtime related APIs sched: cpu_power: enable ARCH_POWER sched/nohz: Clean up select_nohz_load_balancer() sched: Fix load avg vs. cpu-hotplug sched: Remove __ARCH_WANT_INTERRUPTS_ON_CTXSW sched: Fix nohz_idle_balance() sched: Remove useless code in yield_to() sched: Add time unit suffix to sched sysctl knobs sched/debug: Limit sd->*_idx range on sysctl sched: Remove AFFINE_WAKEUPS feature flag s390: Remove leftover account_tick_vtime() header cputime: Consolidate vtime handling on context switch sched: Move cputime code to its own file cputime: Generalize CONFIG_VIRT_CPU_ACCOUNTING tile: Remove SD_PREFER_LOCAL leftover ...		2012-10-01 10:43:39 -07:00
..
auto_group.c	sched: Clean up parameter passing of proc_sched_autogroup_set_nice()	2012-03-02 12:23:49 +01:00
auto_group.h
clock.c
core.c	Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-10-01 10:43:39 -07:00
cpupri.c	sched: Fix minor code style issues	2012-07-26 11:47:00 +02:00
cpupri.h
cputime.c	vtime: Consolidate system/idle context detection	2012-09-25 15:42:37 +02:00
debug.c	sched/debug: Fix printing large integers on 32-bit platforms	2012-05-14 15:05:28 +02:00
fair.c	Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-10-01 10:43:39 -07:00
features.h	sched: cpu_power: enable ARCH_POWER	2012-09-13 16:52:06 +02:00
idle_task.c	sched/nohz: Rewrite and fix load-avg computation -- again	2012-07-05 20:58:13 +02:00
Makefile	sched: Move cputime code to its own file	2012-08-20 13:05:17 +02:00
rt.c	sched: Remove __ARCH_WANT_INTERRUPTS_ON_CTXSW	2012-09-13 16:52:04 +02:00
sched.h	sched: Remove __ARCH_WANT_INTERRUPTS_ON_CTXSW	2012-09-13 16:52:04 +02:00
stats.c	sched: Remove sched_switch	2012-01-27 13:28:53 +01:00
stats.h
stop_task.c	sched: Fix migration thread runtime bogosity	2012-08-13 18:41:55 +02:00