diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-13 16:52:27 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-13 16:52:27 -0400 |
| commit | dbbcfb2211761fa69e831a78119c9288fb87eb9d (patch) | |
| tree | b40b103ed250e287bf3d4790f1c87001cf7cf52f /arch/x86/kernel | |
| parent | b0356cd0e7497252a2c45ecb07b79d931390c8b2 (diff) | |
| parent | 9df2fe986770bc4c76e8fe72c20b71268eec39a7 (diff) | |
Merge branch 'linus' into x86/pci-ioapic-boot-irq-quirks
Conflicts:
arch/x86/mm/ioremap.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel')
| -rw-r--r-- | arch/x86/kernel/.gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/.gitignore b/arch/x86/kernel/.gitignore index 4ea38a39aed4..08f4fd731469 100644 --- a/arch/x86/kernel/.gitignore +++ b/arch/x86/kernel/.gitignore | |||
| @@ -1,2 +1,3 @@ | |||
| 1 | vsyscall.lds | 1 | vsyscall.lds |
| 2 | vsyscall_32.lds | 2 | vsyscall_32.lds |
| 3 | vmlinux.lds | ||