Uwe Kleine-König 2dcf78c0ee Merge branch 'imx/for-2.6.36' of git://git.pengutronix.de/git/ukl/linux-2.6 into HEAD ...

There are some more conflicts than detected by git, namely support for
the newly added cpuimx machines needed to be converted to dynamic device
registration.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Conflicts:
	arch/arm/mach-imx/Makefile
	arch/arm/mach-imx/devices.c
	arch/arm/mach-imx/devices.h
	arch/arm/mach-imx/eukrea_mbimx27-baseboard.c
	arch/arm/mach-mx2/Kconfig
	arch/arm/mach-mx25/Makefile
	arch/arm/mach-mx25/devices.c
	arch/arm/plat-mxc/include/mach/mx25.h
	arch/arm/plat-mxc/include/mach/mxc_nand.h

2010-07-26 14:27:25 +02:00

..

alpha

asm-generic: remove ARCH_HAS_SG_CHAIN in scatterlist.h

2010-05-27 09:12:54 -07:00

arm

Merge branch 'imx/for-2.6.36' of git://git.pengutronix.de/git/ukl/linux-2.6 into HEAD

2010-07-26 14:27:25 +02:00

avr32

avr32: use asm-generic/scatterlist.h

2010-05-27 09:12:54 -07:00

blackfin

blackfin: use use asm-generic/scatterlist.h

2010-05-27 09:12:55 -07:00

cris

cris: use asm-generic/scatterlist.h

2010-05-27 09:12:55 -07:00

frv

FRV: ARCH_KMALLOC_MINALIGN was already defined

2010-05-28 10:17:21 -07:00

h8300

h8300: use asm-generic/scatterlist.h

2010-05-27 09:12:55 -07:00

ia64

ia64: revert __node_random addition

2010-05-30 10:08:03 -07:00

m32r

m32r: use use asm-generic/scatterlist.h

2010-05-27 09:12:55 -07:00

m68k

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k

2010-05-27 10:19:19 -07:00

m68knommu

arch/m68knommu/platform/68360/commproc.c: Checkpatch cleanup

2010-05-24 14:44:25 +10:00

microblaze

asm-generic: remove ARCH_HAS_SG_CHAIN in scatterlist.h

2010-05-27 09:12:54 -07:00

mips

mips: use use asm-generic/scatterlist.h

2010-05-27 09:12:55 -07:00

mn10300

mn10300: use asm-generic/scatterlist.h

2010-05-27 09:12:55 -07:00

parisc

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6

2010-05-30 09:02:02 -07:00

powerpc

tracing: fix for tracepoint API change

2010-05-28 10:20:14 -07:00

s390

Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

2010-05-27 10:48:46 -07:00

score

asm-generic: remove ISA_DMA_THRESHOLD in scatterlist.h

2010-05-27 09:12:54 -07:00

sh

asm-generic: add NEED_SG_DMA_LENGTH to define sg_dma_len()

2010-05-27 09:12:54 -07:00

sparc

Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2010-05-27 15:23:47 -07:00

um

Merge branch 'bkl/ioctl' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing

2010-05-24 08:01:10 -07:00

x86

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6

2010-05-30 09:13:08 -07:00

xtensa

xtensa: use use asm-generic/scatterlist.h

2010-05-27 09:12:55 -07:00

.gitignore

…

Kconfig

hw-breakpoints: Separate constraint space for data and instruction breakpoints

2010-05-01 04:32:11 +02:00