redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity
alistair23-linux/arch/arm/mach-imx
History
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
..
include/mach ARM: imx: new Kconfig symbol and feature test macro for DMA on mx1 and mx2 2010-06-30 08:59:58 +02:00
Kconfig 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
Makefile 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
Makefile.boot ARM: imx: move mx1 support to mach-imx 2010-06-30 08:59:44 +02:00
clock-imx1.c ARM: imx: move mx1 support to mach-imx 2010-06-30 08:59:44 +02:00
clock-imx21.c ARM: imx: rename mach dir for mx21 and mx27 to mach-imx 2010-06-24 15:40:38 +02:00
clock-imx27.c 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
cpu-imx27.c ARM: imx: rename mach dir for mx21 and mx27 to mach-imx 2010-06-24 15:40:38 +02:00
devices-imx1.h ARM: imx: dynamically register imx-uart devices (imx1) 2010-06-30 09:00:54 +02:00
devices-imx21.h ARM: imx: dynamically register imx-uart devices (imx21) 2010-06-30 09:00:55 +02:00
devices-imx27.h ARM: imx: dynamically register imx-uart devices (imx27) 2010-06-30 09:00:57 +02:00
devices.c 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
devices.h 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
dma-v1.c ARM: imx: new Kconfig symbol and feature test macro for DMA on mx1 and mx2 2010-06-30 08:59:58 +02:00
eukrea_mbimx27-baseboard.c 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
mach-cpuimx27.c 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
mach-imx27lite.c ARM: imx: dynamically register imx-uart devices (imx27) 2010-06-30 09:00:57 +02:00
mach-mx1ads.c ARM: imx: dynamically register imx-uart devices (imx1) 2010-06-30 09:00:54 +02:00
mach-mx21ads.c ARM: imx: dynamically register imx-uart devices (imx21) 2010-06-30 09:00:55 +02:00
mach-mx27_3ds.c ARM: imx: dynamically register imx-uart devices (imx27) 2010-06-30 09:00:57 +02:00
mach-mx27ads.c ARM: imx: dynamically register imx-uart devices (imx27) 2010-06-30 09:00:57 +02:00
mach-mxt_td60.c ARM: imx: dynamically register imx-uart devices (imx27) 2010-06-30 09:00:57 +02:00
mach-pca100.c 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
mach-pcm038.c ARM: imx: dynamically register imx-uart devices (imx27) 2010-06-30 09:00:57 +02:00
mach-scb9328.c ARM: imx: dynamically register imx-uart devices (imx1) 2010-06-30 09:00:54 +02:00
mm-imx1.c ARM: imx: remove paragraphs with old address of the FSF 2010-06-30 09:00:23 +02:00
mm-imx21.c ARM: imx: get rid of mxc_gpio_init 2010-06-24 15:40:40 +02:00
mm-imx27.c ARM: imx: get rid of mxc_gpio_init 2010-06-24 15:40:40 +02:00
mx1-camera-fiq-ksym.c ARM: imx: move mx1 support to mach-imx 2010-06-30 08:59:44 +02:00
mx1-camera-fiq.S ARM: imx: move mx1 support to mach-imx 2010-06-30 08:59:44 +02:00
pcm970-baseboard.c ARM: imx: rename mach dir for mx21 and mx27 to mach-imx 2010-06-24 15:40:38 +02:00
pm-imx27.c 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