Ingo Molnar 6e15cf0486 Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2 ...

Conflicts:
	arch/parisc/kernel/irq.c
	arch/x86/include/asm/fixmap_64.h
	arch/x86/include/asm/setup.h
	kernel/irq/handle.c

Semantic merge:
        arch/x86/include/asm/fixmap.h

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

2009-03-27 17:28:43 +01:00

..

dump_pagetables.c

…

extable.c

x86: uaccess: introduce try and catch framework

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

fault.c

x86, mm: fault.c, simplify kmmio_fault(), cleanup

2009-02-22 10:24:18 +01:00

gup.c

x86: two trivial sparse annotations

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

highmem_32.c

x86: set_highmem_pages_init() cleanup, fix !CONFIG_NUMA && CONFIG_HIGHMEM=y

2009-03-03 15:32:24 +01:00

hugetlbpage.c

…

init_32.c

Merge branch 'x86/core' into core/percpu

2009-03-04 02:29:19 +01:00

init_64.c

x86: un-__init fill_pud/pmd/pte

2009-03-04 02:29:36 +01:00

init.c

x86: unify free_init_pages() and free_initmem()

2009-03-03 12:21:18 +01:00

iomap_32.c

Revert "gpu/drm, x86, PAT: PAT support for io_mapping_*"

2009-03-01 12:47:49 +01:00

ioremap.c

Merge branch 'x86/urgent' into x86/pat

2009-02-25 16:40:10 +01:00

k8topology_64.c

x86: k8 numa register active regions later

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

kmmio.c

x86 mmiotrace: fix remove_kmmio_fault_pages()

2009-03-08 19:51:23 +01:00

Makefile

x86: unify free_init_pages() and free_initmem()

2009-03-03 12:21:18 +01:00

memtest.c

x86: memtest: add additional (regular) test patterns

2009-02-25 12:19:47 +01: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

Merge branches 'x86/apic', 'x86/cpu', 'x86/fixmap', 'x86/mm', 'x86/sched', 'x86/setup-lzma', 'x86/signal' and 'x86/urgent' into x86/core

2009-03-04 02:22:31 +01:00

numa_64.c

Merge branch 'linus' into x86/apic

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

pageattr-test.c

…

pageattr.c

Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2

2009-03-27 17:28:43 +01:00

pat.c

Merge branch 'x86/urgent' into x86/pat

2009-03-01 12:47:58 +01:00

pf_in.c

…

pf_in.h

…

pgtable_32.c

Merge branches 'x86/apic', 'x86/cpu', 'x86/fixmap', 'x86/mm', 'x86/sched', 'x86/setup-lzma', 'x86/signal' and 'x86/urgent' into x86/core

2009-03-04 02:22:31 +01:00

pgtable.c

x86, fixmap: define reserve_top_address for x86_64

2009-02-27 20:57:47 -08:00

srat_32.c

…

srat_64.c

x86, apic: remove genapic.h

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

testmmiotrace.c

x86: add far read test to testmmiotrace

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

tlb.c

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

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