summaryrefslogtreecommitdiffstats
path: root/arch/frv/include/asm/auxvec.h
diff options
context:
space:
mode:
authorIngo Molnar2009-04-29 14:46:59 +0200
committerIngo Molnar2009-04-29 14:47:05 +0200
commite7fd5d4b3d240f42c30a9e3d20a4689c4d3a795a (patch)
tree4ba588631dd8189a818a91c9e3976526071178b6 /arch/frv/include/asm/auxvec.h
parentperf_counter tools: fix Documentation/perf_counter build error (diff)
parentMerge branch 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff)
downloadkernel-qcow2-linux-e7fd5d4b3d240f42c30a9e3d20a4689c4d3a795a.tar.gz
kernel-qcow2-linux-e7fd5d4b3d240f42c30a9e3d20a4689c4d3a795a.tar.xz
kernel-qcow2-linux-e7fd5d4b3d240f42c30a9e3d20a4689c4d3a795a.zip
Merge branch 'linus' into perfcounters/core
Merge reason: This brach was on -rc1, refresh it to almost-rc4 to pick up the latest upstream fixes. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/frv/include/asm/auxvec.h')
-rw-r--r--arch/frv/include/asm/auxvec.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/frv/include/asm/auxvec.h b/arch/frv/include/asm/auxvec.h
new file mode 100644
index 000000000000..07710778fa10
--- /dev/null
+++ b/arch/frv/include/asm/auxvec.h
@@ -0,0 +1,4 @@
+#ifndef __FRV_AUXVEC_H
+#define __FRV_AUXVEC_H
+
+#endif