Ingo Molnar 30cd324e97 Merge branches 'tracing/ftrace', 'tracing/ring-buffer' and 'tracing/urgent' into tracing/core ... Conflicts: include/linux/ftrace.h		2008-12-19 09:42:40 +01:00
..
Kconfig	PM_TEST_SUSPEND should depend on RTC_CLASS, not RTC_LIB	2008-11-01 12:40:38 -07:00
Makefile	PM: Remove legacy PM	2008-04-15 03:19:07 -04:00
console.c	PM/gxfb: add hook to PM console layer that allows disabling of suspend VT switch	2008-04-28 08:58:36 -07:00
disk.c	tracing: allow tracing of suspend/resume & hibernation code again	2008-11-23 10:48:44 +01:00
main.c	tracing: allow tracing of suspend/resume & hibernation code again	2008-11-23 10:48:44 +01:00
power.h	[PATCH] propagate mode through swsusp_close()	2008-10-21 07:49:02 -04:00
poweroff.c	pm: schedule sysrq poweroff on boot cpu	2008-07-24 10:47:24 -07:00
process.c	container freezer: skip frozen cgroups during power management resume	2008-10-20 08:52:34 -07:00
snapshot.c	pm: hibernation: simplify memory bitmap	2008-07-24 10:47:23 -07:00
swap.c	[PATCH] kill obsolete temporary comment in swsusp_close()	2008-12-04 04:22:54 -05:00
swsusp.c	Hibernation: Update messages	2008-02-01 18:30:55 -05:00
user.c	pm: rework disabling of user mode helpers during suspend/hibernation	2008-10-16 11:21:29 -07:00