Merge branches 'x86/numa-fixes', 'x86/apic', 'x86/apm', 'x86/bitops', 'x86/build...
authorIngo Molnar <mingo@elte.hu>
Tue, 8 Jul 2008 07:16:56 +0000 (09:16 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 8 Jul 2008 07:16:56 +0000 (09:16 +0200)
commit6924d1ab8b7bbe5ab416713f5701b3316b2df85b
treeaffbf0ff13f7522336f25505e8e7b5f12a34e705
parent4e78c91abe1a40b905611100a593be62784ba355
parent25556c1699ad84dd6077adf67c92eba362aa7dc2
parentb764a15f679942a7bc9d4f9645299e1defcc5b43
parent437a0a54eea7b101e8a5b70688009956f6522ed0
parent41b3eae669fb1ef6ae4acaa937b4e4617a1aa078
parent84e65b0a84a2c856bef36f13d122047678408b0a
parent684eb0163a98bc329193b4aa4535cdd705a5dd58
parent93022136fff9e6130aa128a5ed8a599e93ac813c
parent5cb04df8d3f03e37a19f2502591a84156be71772
parent44974c8fc1d7047abe414562e0782320f4c1f511
parent48cf937f48f68bd1e61f37c6357dbff5adb95532
parent205f93288093df69f9ab5f6981aef27b91088b28
parentc54f9da1c8ceee19436430afac0798a989eb886d
parent0ed368c71aa65cba8d349432bd4dab4a9a2eb39c
parentb478458aeebfc55fe409abec43794ac72a623c79
parent2d144e63098be47c21ad59d68a4fd17bd73a3aaf
parent607baf1f4ef94637ab0f7d0e258932851dc5c0a2
parent33af9039cbf629041da2bfa0cf451208391a1ec3
parent3557b18fcbe0e29706214f3c7cc680a7823605eb
parent63687a528c39a67c1a213cdffa09feb0e6af9dbe
parent009b9fc98ddd83f9139fdabb12c0d7a8535d5421
parentf6477cc76c73833a56e97f1fafc36a7ca92927e5
parente6b0edef3453677b13e175a104a83eb36d062dd3
parent400d34944c4ad82a817c06e570bc93b1114aa596
Merge branches 'x86/numa-fixes', 'x86/apic', 'x86/apm', 'x86/bitops', 'x86/build', 'x86/cleanups', 'x86/cpa', 'x86/cpu', 'x86/defconfig', 'x86/gart', 'x86/i8259', 'x86/intel', 'x86/irqstats', 'x86/kconfig', 'x86/ldt', 'x86/mce', 'x86/memtest', 'x86/pat', 'x86/ptemask', 'x86/resumetrace', 'x86/threadinfo', 'x86/timers', 'x86/vdso' and 'x86/xen' into x86/devel
21 files changed:
arch/x86/Kconfig
arch/x86/kernel/Makefile
arch/x86/kernel/apic_32.c
arch/x86/kernel/apic_64.c
arch/x86/kernel/head_64.S
arch/x86/kernel/io_apic_32.c
arch/x86/kernel/io_apic_64.c
arch/x86/kernel/pci-dma.c
arch/x86/kernel/setup_64.c
arch/x86/kernel/smpboot.c
arch/x86/kernel/vmlinux_64.lds.S
arch/x86/mm/init_32.c
arch/x86/mm/init_64.c
arch/x86/mm/ioremap.c
arch/x86/mm/pageattr.c
arch/x86/xen/mmu.c
fs/proc/proc_misc.c
include/asm-x86/apic.h
include/asm-x86/nmi.h
include/asm-x86/page.h
include/asm-x86/pgtable.h