diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-12 16:53:38 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-12 16:53:38 +1000 |
| commit | bc47ab0241c7c86da4f5e5f82fbca7d45387c18d (patch) | |
| tree | b9c33ae8b6de43e44cc5fcbaa3e4a15f18a5ed42 /arch/x86/boot/.gitignore | |
| parent | 37f9ef553bed630957e025504cdcbc76f5de49d5 (diff) | |
| parent | 8ebf975608aaebd7feb33d77f07ba21a6380e086 (diff) | |
Merge commit 'origin/master' into next
Manual merge of:
arch/powerpc/kernel/asm-offsets.c
Diffstat (limited to 'arch/x86/boot/.gitignore')
| -rw-r--r-- | arch/x86/boot/.gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/boot/.gitignore b/arch/x86/boot/.gitignore index 172cf8a98bd..851fe936d24 100644 --- a/arch/x86/boot/.gitignore +++ b/arch/x86/boot/.gitignore @@ -3,6 +3,8 @@ bzImage cpustr.h mkcpustr offsets.h +voffset.h +zoffset.h setup setup.bin setup.elf |