diff options
author | Ingo Molnar <mingo@elte.hu> | 2012-03-13 05:54:39 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2012-03-13 05:54:41 +0100 |
commit | e898c6706869fdcbd68b1e7fb0ac7461d98710fe (patch) | |
tree | 28054da88ddda324f78f27083b14328113941fbc /arch/x86/vdso/.gitignore | |
parent | x86: Use enum instead of literals for trap values (diff) | |
parent | x32: Add ptrace for x32 (diff) | |
download | linux-e898c6706869fdcbd68b1e7fb0ac7461d98710fe.tar.xz linux-e898c6706869fdcbd68b1e7fb0ac7461d98710fe.zip |
Merge branch 'x86/x32' into x86/cleanups
Merge reason: We are going to merge a dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/vdso/.gitignore')
-rw-r--r-- | arch/x86/vdso/.gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/vdso/.gitignore b/arch/x86/vdso/.gitignore index 60274d5746e1..3282874bc61d 100644 --- a/arch/x86/vdso/.gitignore +++ b/arch/x86/vdso/.gitignore @@ -1,5 +1,7 @@ vdso.lds vdso-syms.lds +vdsox32.lds +vdsox32-syms.lds vdso32-syms.lds vdso32-syscall-syms.lds vdso32-sysenter-syms.lds |