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	…
console.c	…
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	…
process.c	container freezer: skip frozen cgroups during power management resume	2008-10-20 08:52:34 -07:00
snapshot.c	…
swap.c	[PATCH] kill obsolete temporary comment in swsusp_close()	2008-12-04 04:22:54 -05:00
swsusp.c	…
user.c	…