You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Ingo Molnar 30cd324e97 Merge branches 'tracing/ftrace', 'tracing/ring-buffer' and 'tracing/urgent' into tracing/core ... Conflicts: include/linux/ftrace.h		16 years ago
..
Kconfig	…
Makefile	…
console.c	…
disk.c	tracing: allow tracing of suspend/resume & hibernation code again	16 years ago
main.c	tracing: allow tracing of suspend/resume & hibernation code again	16 years ago
power.h	…
poweroff.c	…
process.c	…
snapshot.c	…
swap.c	[PATCH] kill obsolete temporary comment in swsusp_close()	16 years ago
swsusp.c	…
user.c	…