Commit message (Collapse) | Author | Age | ||
---|---|---|---|---|
... | ||||
* | Merge branch 'linus' into tracing/blktrace | Ingo Molnar | 2009-02-19 | |
| | | | | | | | | | | Conflicts: block/blktrace.c Semantic merge: kernel/trace/blktrace.c Signed-off-by: Ingo Molnar <mingo@elte.hu> | |||
* | tracing/blktrace: move the tracing file to kernel/trace | Frederic Weisbecker | 2009-02-09 | |
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> |