Ingo Molnar ae94b8075a Merge branch 'linus' into x86/core ...

Conflicts:

	arch/x86/mm/ioremap.c

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

2008-07-12 07:29:02 +02:00

..

discontig_32.c

x86: remove have_arch_parse_srat -v2

2008-07-08 15:49:01 +02:00

dump_pagetables.c

x86_64: use PAGE_OFFSET in dump_pagetables

2008-07-08 08:12:06 +02:00

extable.c

x86: unify extable_{32|64}.c

2008-01-30 13:31:41 +01:00

fault.c

x86: simplify vmalloc_sync_all

2008-07-08 13:10:59 +02:00

highmem_32.c

x86: unexport kmap_atomic_to_page

2008-04-30 23:15:34 +02:00

hugetlbpage.c

x86: stricter check in follow_huge_addr()

2008-03-27 16:08:45 +01:00

init_32.c

x86: introduce max_low_pfn_mapped for 64-bit

2008-07-11 10:24:04 +02:00

init_64.c

x86: introduce max_low_pfn_mapped for 64-bit

2008-07-11 10:24:04 +02:00

ioremap.c

Merge branch 'linus' into x86/core

2008-07-12 07:29:02 +02:00

k8topology_64.c

x86: remove end_pfn in 64bit

2008-07-08 13:10:38 +02:00

Makefile

x86: remove acpi_srat config v2

2008-07-08 15:49:08 +02:00

mmap.c

x86: unify mmap_{32|64}.c

2008-01-30 13:31:10 +01:00

numa_64.c

x86: remove end_pfn in 64bit

2008-07-08 13:10:38 +02:00

pageattr-test.c

x86/cpa: use an undefined PTE bit for testing CPA

2008-07-08 13:16:30 +02:00

pageattr.c

x86: introduce max_low_pfn_mapped for 64-bit

2008-07-11 10:24:04 +02:00

pat.c

x86: introduce max_low_pfn_mapped for 64-bit

2008-07-11 10:24:04 +02:00

pgtable_32.c

arch/x86/mm/pgtable_32.c: remove unused variable `fixmaps'

2008-07-09 08:18:40 +02:00

pgtable.c

x86: preallocate and prepopulate separately

2008-07-08 13:11:02 +02:00

srat_32.c

x86: remove acpi_srat config v2

2008-07-08 15:49:08 +02:00

srat_64.c

x86: reserve SLIT

2008-07-11 10:22:33 +02:00