Merge branches 'tracing/ftrace', 'tracing/kmemtrace' and 'linus' into tracing/core

This commit is contained in:
Ingo Molnar
2009-02-03 06:25:38 +01:00
1490 changed files with 27346 additions and 12340 deletions

View File

@@ -1,6 +1,7 @@
#ifndef BLKTRACE_H
#define BLKTRACE_H
#include <linux/types.h>
#ifdef __KERNEL__
#include <linux/blkdev.h>
#include <linux/relay.h>