Ingo Molnar a3d06cc6aa Merge branch 'linus' into perfcounters/core ...

Conflicts:
	arch/x86/include/asm/kmap_types.h
	include/linux/mm.h

	include/asm-generic/kmap_types.h

Merge reason: We crossed changes with kmap_types.h cleanups in mainline.

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

2009-06-17 13:06:17 +02:00

..

alpha

kmap_types: make most arches use generic header file

2009-06-16 19:47:51 -07:00

arm

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6

2009-06-16 21:15:42 -07:00

avr32

mm: consolidate init_mm definition

2009-06-16 19:47:28 -07:00

blackfin

Merge branch 'akpm'

2009-06-16 19:50:13 -07:00

cris

kmap_types: make most arches use generic header file

2009-06-16 19:47:51 -07:00

frv

mm: consolidate init_mm definition

2009-06-16 19:47:28 -07:00

h8300

kmap_types: make most arches use generic header file

2009-06-16 19:47:51 -07:00

ia64

kmap_types: make most arches use generic header file

2009-06-16 19:47:51 -07:00

m32r

kmap_types: make most arches use generic header file

2009-06-16 19:47:51 -07:00

m68k

kmap_types: make most arches use generic header file

2009-06-16 19:47:51 -07:00

m68knommu

mm: consolidate init_mm definition

2009-06-16 19:47:28 -07:00

microblaze

kmap_types: make most arches use generic header file

2009-06-16 19:47:51 -07:00

mips

Merge branch 'akpm'

2009-06-16 19:50:13 -07:00

mn10300

kmap_types: make most arches use generic header file

2009-06-16 19:47:51 -07:00

parisc

kmap_types: make most arches use generic header file

2009-06-16 19:47:51 -07:00

powerpc

Merge branch 'linus' into perfcounters/core

2009-06-17 13:06:17 +02:00

s390

Merge branch 'akpm'

2009-06-16 19:50:13 -07:00

sh

kmap_types: make most arches use generic header file

2009-06-16 19:47:51 -07:00

sparc

Merge branch 'akpm'

2009-06-16 19:50:13 -07:00

um

Merge branch 'akpm'

2009-06-16 19:50:13 -07:00

x86

Merge branch 'linus' into perfcounters/core

2009-06-17 13:06:17 +02:00

xtensa

kmap_types: make most arches use generic header file

2009-06-16 19:47:51 -07:00

.gitignore

…

Kconfig

…