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

..

console.c

…

disk.c

…

Kconfig

…

main.c

…

Makefile

…

power.h

…

poweroff.c

…

process.c

…

snapshot.c

…

swap.c

…

swsusp.c

…

user.c

…