diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-04 13:02:35 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-04 13:02:35 +0200 |
| commit | 42390cdec5f6e6e2ee54f308474a6ef7dd16aa5c (patch) | |
| tree | e9684c84f53272319a5acd4b9c86503f30274a51 /include/asm-blackfin/auxvec.h | |
| parent | 11c231a962c740b3216eb6565149ae5a7944cba7 (diff) | |
| parent | d210baf53b699fc61aa891c177b71d7082d3b957 (diff) | |
Merge branch 'linus' into x86/x2apic
Conflicts:
arch/x86/kernel/cpu/cyrix.c
include/asm-x86/cpufeature.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-blackfin/auxvec.h')
| -rw-r--r-- | include/asm-blackfin/auxvec.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/asm-blackfin/auxvec.h b/include/asm-blackfin/auxvec.h deleted file mode 100644 index 215506cd87b..00000000000 --- a/include/asm-blackfin/auxvec.h +++ /dev/null @@ -1,4 +0,0 @@ -#ifndef __ASMBFIN_AUXVEC_H -#define __ASMBFIN_AUXVEC_H - -#endif |