summaryrefslogtreecommitdiffstats
path: root/include/asm-mn10300
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-04-01 21:54:19 +0200
committerIngo Molnar <mingo@elte.hu>2009-04-02 00:49:02 +0200
commit8302294f43250dc337108c51882a6007f2b1e2e0 (patch)
tree85acd4440799c46a372df9cad170fa0c21e59096 /include/asm-mn10300
parentMerge branch 'for-linus' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 (diff)
parentring-buffer: do not remove reader page from list on ring buffer free (diff)
downloadlinux-8302294f43250dc337108c51882a6007f2b1e2e0.tar.xz
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 'include/asm-mn10300')
-rw-r--r--include/asm-mn10300/ftrace.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-mn10300/ftrace.h b/include/asm-mn10300/ftrace.h
new file mode 100644
index 000000000000..40a8c178f10d
--- /dev/null
+++ b/include/asm-mn10300/ftrace.h
@@ -0,0 +1 @@
+/* empty */