Ingo Molnar 737f24bda7 Merge branch 'perf/urgent' into perf/core ...

Conflicts:
	tools/perf/builtin-record.c
	tools/perf/builtin-top.c
	tools/perf/perf.h
	tools/perf/util/top.h

Merge reason: resolve these cherry-picking conflicts.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

2012-03-05 09:20:08 +01:00

..

governors

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux

2011-11-07 10:13:52 -08:00

cpuidle.c

cpuidle/tracing: Denote the tracepoints as being in rcu_idle_exit() section

2012-02-13 09:14:46 -05:00

cpuidle.h

cpu: convert 'cpu' and 'machinecheck' sysdev_class to a regular subsystem

2011-12-21 14:29:42 -08:00

driver.c

cpuidle: Single/Global registration of idle states

2011-11-06 21:13:58 -05:00

governor.c

cpuidle: create bootparam "cpuidle.off=1"

2011-08-03 19:06:36 -04:00

Kconfig

cpuidle: Default y on powerpc pSeries

2012-02-22 16:48:51 +11:00

Makefile

cpuidle: consolidate 2.6.22 cpuidle branch into one patch

2007-10-10 00:12:41 -04:00

sysfs.c

cpu: convert 'cpu' and 'machinecheck' sysdev_class to a regular subsystem

2011-12-21 14:29:42 -08:00