Merge branch 'x86/urgent' into x86/irq

Browse source

Merge reason: conflict in arch/x86/kernel/apic/io_apic.c

Resolved Conflicts:
	arch/x86/kernel/apic/io_apic.c

Signed-off-by: H. Peter Anvin <hpa@zytor.com>

...

This commit is contained in:

H. Peter Anvin 2010-02-20 21:51:42 -08:00

parent ca4dbc6684 eb5b379406

commit aef55d4922

13 changed files with 103 additions and 43 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

1

arch/x86/ia32/ia32_aout.c

View file

1

arch/x86/include/asm/io_apic.h

View file

4

arch/x86/include/asm/system.h

View file

14

arch/x86/kernel/acpi/boot.c

View file

17

arch/x86/kernel/apic/apic.c

View file

54

arch/x86/kernel/apic/io_apic.c

View file

29

arch/x86/kernel/apic/probe_32.c

View file

2

arch/x86/kernel/apic/probe_64.c

View file

7

arch/x86/kernel/mpparse.c

View file

8

arch/x86/kernel/reboot.c

View file

2

arch/x86/kernel/smpboot.c

View file

2

arch/x86/mm/gup.c

View file

5

drivers/char/agp/amd64-agp.c

View file