Ingo Molnar 2b4fa851b2 Merge branch 'x86/numa' into x86/devel ...

Conflicts:

	arch/x86/Kconfig
	arch/x86/kernel/e820.c
	arch/x86/kernel/efi_64.c
	arch/x86/kernel/mpparse.c
	arch/x86/kernel/setup.c
	arch/x86/kernel/setup_32.c
	arch/x86/mm/init_64.c
	include/asm-x86/proto.h

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

2008-07-08 11:59:23 +02:00

..

acpi.c

Merge branch 'x86/numa' into x86/devel

2008-07-08 11:59:23 +02:00

amd_bus.c

Merge branch 'x86/mpparse' into x86/devel

2008-07-08 11:14:58 +02:00

common.c

PCI: Correct last two HP entries in the bfsort whitelist

2008-05-22 18:16:24 +02:00

direct.c

x86: Move PCI IO ECS code to x86/pci

2008-07-08 07:47:39 +02:00

early.c

i386: move pci

2007-10-11 11:16:36 +02:00

fixup.c

x86/pci: remove flag in pci_cfg_space_size_ext

2008-04-29 15:34:05 -07:00

i386.c

x86: rename pat_wc_enabled to pat_enabled

2008-06-12 10:14:27 +02:00

init.c

PCI/x86: fix up PCI stuff so that PCI_GOANY supports OLPC

2008-06-05 14:29:25 -07:00

irq.c

Merge branch 'linus' into x86/cleanups

2008-06-16 11:17:50 +02:00

legacy.c

x86: get mp_bus_to_node early

2008-04-26 23:41:04 +02:00

Makefile

x86_64: move pci

2007-10-11 11:17:12 +02:00

Makefile_32

Merge branch 'x86/mpparse' into x86/devel

2008-07-08 11:14:58 +02:00

Makefile_64

x86/pci: Renaming k8-bus_64.c to amd_bus.c

2008-07-08 07:47:38 +02:00

mmconfig_32.c

x86: clear pci_mmcfg_virt when mmcfg get rejected

2008-04-26 23:41:03 +02:00

mmconfig_64.c

x86: clear pci_mmcfg_virt when mmcfg get rejected

2008-04-26 23:41:03 +02:00

mmconfig-shared.c

x86: make __pci_mmcfg_init static in mmconfig-shared.c

2008-05-25 08:58:28 +02:00

mp_bus_to_node.c

x86: get mp_bus_to_node early

2008-04-26 23:41:04 +02:00

numa.c

x86: make generic arch support NUMAQ

2008-06-10 11:34:42 +02:00

olpc.c

PCI/x86: fix up PCI stuff so that PCI_GOANY supports OLPC

2008-06-05 14:29:25 -07:00

pcbios.c

PCI: remove initial bios sort of PCI devices on x86

2008-04-20 21:46:58 -07:00

pci.h

Merge commit 'v2.6.26-rc9' into x86/cpu

2008-07-08 07:47:47 +02:00

visws.c

Change pci_raw_ops to pci_raw_read/write

2008-02-10 12:52:46 -08:00