2 Commits

Author	SHA1	Message	Date
Ingo Molnar	72c26c9a26	Merge branch 'linus' into tracing/blktrace ... Conflicts: block/blktrace.c Semantic merge: kernel/trace/blktrace.c Signed-off-by: Ingo Molnar <mingo@elte.hu>	2009-02-19 09:00:35 +01:00
Frederic Weisbecker	2db270a80b	tracing/blktrace: move the tracing file to kernel/trace ... Impact: cleanup Move blktrace.c to kernel/trace, also move its config entry. Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com> Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com> Acked-by: Jens Axboe <jens.axboe@oracle.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>	2009-02-09 10:51:02 +01:00