Merge branch 'x86/urgent' into x86/core

Browse source

Conflicts:

	include/asm-x86/gpio.h

Signed-off-by: Ingo Molnar <mingo@elte.hu>

...

This commit is contained in:

Ingo Molnar 2008-07-26 16:30:19 +02:00

parent 6dec3a10a7 3a61ec387c

commit 10d3285d0b

7 changed files with 22 additions and 31 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

26

arch/x86/Kconfig

View file

5

arch/x86/Makefile

View file

4

arch/x86/kernel/amd_iommu.c

View file

4

arch/x86/kernel/amd_iommu_init.c

View file

6

include/asm-x86/gpio.h

View file

2

include/asm-x86/mach-summit/mach_apic.h

View file

6

include/linux/crash_dump.h

View file