Ingo Molnar fc6fc7f1b1 Merge branch 'linus' into x86/apic ...

Conflicts:
	arch/x86/mach-default/setup.c

Semantic conflict resolution:
	arch/x86/kernel/setup.c

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

2009-02-22 20:05:19 +01:00

..

dump_pagetables.c

x86: another user of PTE_FLAGS_MASK

2008-08-20 12:38:41 +02:00

extable.c

x86: uaccess: introduce try and catch framework

2009-01-23 17:17:36 -08:00

fault.c

Merge branch 'x86/untangle2' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen into x86/headers

2009-02-13 13:09:00 +01:00

gup.c

x86: two trivial sparse annotations

2008-10-29 08:02:28 +01:00

highmem_32.c

Export kmap_atomic_pfn for DRM-GEM.

2008-10-18 07:10:12 +10:00

hugetlbpage.c

x86: add hugepagesz option on 64-bit

2008-07-24 10:47:19 -07:00

init_32.c

Merge branches 'x86/acpi', 'x86/asm', 'x86/cpudetect', 'x86/crashdump', 'x86/debug', 'x86/defconfig', 'x86/doc', 'x86/header-fixes', 'x86/headers' and 'x86/minor-fixes' into x86/core

2009-02-13 09:46:36 +01:00

init_64.c

x86: remove kernel_physical_mapping_init() from init section

2009-01-20 00:31:43 +01:00

iomap_32.c

x86: work around PAGE_KERNEL_WC not getting WC in iomap_atomic_prot_pfn.

2009-01-26 11:14:27 +01:00

ioremap.c

Merge branches 'x86/paravirt', 'x86/pat', 'x86/setup-v2', 'x86/subarch', 'x86/uaccess' and 'x86/urgent' into x86/core

2009-02-13 09:47:32 +01:00

k8topology_64.c

x86: k8 numa register active regions later

2009-01-06 13:21:21 +01:00

kmmio.c

- fix mmioftrace + rcu merge interaction

2008-05-25 09:51:43 +02:00

Makefile

x86: replace CONFIG_X86_SMP with CONFIG_SMP

2009-01-29 14:17:00 +01:00

memtest.c

x86: memtest fix use of reserve_early()

2008-10-22 17:08:06 +02:00

mmap.c

x86: update copyrights

2009-01-31 04:21:18 +01:00

mmio-mod.c

mmiotrace: remove left-over marker cruft

2008-10-14 10:37:17 +02:00

numa_32.c

trivial: replace last usages of __FUNCTION__ in kernel

2009-01-07 15:48:54 -08:00

numa_64.c

Merge branch 'linus' into x86/apic

2009-02-22 20:05:19 +01:00

pageattr-test.c

x86: make sure the CPA test code's use of _PAGE_UNUSED1 is obvious

2008-09-05 17:09:57 +02:00

pageattr.c

x86: use the right protections for split-up pagetables

2009-02-20 08:35:03 +01:00

pat.c

Merge branches 'x86/paravirt', 'x86/pat', 'x86/setup-v2', 'x86/subarch', 'x86/uaccess' and 'x86/urgent' into x86/core

2009-02-13 09:47:32 +01:00

pf_in.c

x86: fix mmiotrace 8-bit register decoding

2008-10-14 10:33:50 +02:00

pf_in.h

x86 mmiotrace: move files into arch/x86/mm/.

2008-05-24 11:25:37 +02:00

pgtable_32.c

i386: vmalloc size fix

2008-08-21 10:13:21 +02:00

pgtable.c

x86: pgd_{c,d}tor() cleanup

2008-09-06 19:47:09 +02:00

srat_32.c

x86: don't call e820_regiter_active_regions if out of range on node

2008-08-14 11:35:52 +02:00

srat_64.c

x86, apic: remove genapic.h

2009-02-17 17:52:44 +01:00

testmmiotrace.c

x86 mmiotrace: implement mmiotrace_printk()

2008-10-14 10:37:11 +02:00

tlb.c

x86, apic: remove duplicate asm/apic.h inclusions

2009-02-17 17:52:44 +01:00