diff options
author | 2009-04-01 21:54:19 +0200 | |
---|---|---|
committer | 2009-04-02 00:49:02 +0200 | |
commit | 8302294f43250dc337108c51882a6007f2b1e2e0 (patch) | |
tree | 85acd4440799c46a372df9cad170fa0c21e59096 /arch/mips | |
parent | Merge branch 'for-linus' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 (diff) | |
parent | ring-buffer: do not remove reader page from list on ring buffer free (diff) | |
download | linux-8302294f43250dc337108c51882a6007f2b1e2e0.tar.gz linux-8302294f43250dc337108c51882a6007f2b1e2e0.tar.bz2 linux-8302294f43250dc337108c51882a6007f2b1e2e0.zip |
Merge branch 'tracing/core-v2' into tracing-for-linus
Conflicts:
include/linux/slub_def.h
lib/Kconfig.debug
mm/slob.c
mm/slub.c
Diffstat (limited to 'arch/mips')
-rw-r--r-- | arch/mips/include/asm/ftrace.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/include/asm/ftrace.h b/arch/mips/include/asm/ftrace.h new file mode 100644 index 000000000000..40a8c178f10d --- /dev/null +++ b/arch/mips/include/asm/ftrace.h @@ -0,0 +1 @@ +/* empty */ |