Colin Cross 633c6f1b21 Merge commit 'v3.4.5' into android-3.4 ... Conflicts: drivers/base/power/main.c Change-Id: I0c7d106d2de75d0e40f167245ad4cc37e1556bb0		2012-07-16 15:25:51 -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 commit 'v3.4.5' into android-3.4	2012-07-16 15:25:51 -07:00
cpupri.c	kernel-doc: fix kernel-doc warnings in sched	2012-01-23 08:44:54 -08:00
cpupri.h
debug.c	sched: Remove sched_switch	2012-01-27 13:28:53 +01:00
fair.c	sched: Fix more load-balancing fallout	2012-04-26 12:54:52 +02:00
features.h	sched: Fix more load-balancing fallout	2012-04-26 12:54:52 +02:00
idle_task.c
Makefile
rt.c	sched/rt: fix SCHED_RR across cgroups	2012-05-18 17:03:09 -07:00
sched.h	Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-03-31 13:35:31 -07:00
stats.c	sched: Remove sched_switch	2012-01-27 13:28:53 +01:00
stats.h
stop_task.c