redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity
alistair23-linux/arch/arm/mach-mx3
History
Mark Brown e4862f2f6f Merge branch 'for-2.6.36' into for-2.6.37 
Fairly simple conflicts, the most serious ones are the i.MX ones which I
suspect now need another rename.

Conflicts:
	arch/arm/mach-mx2/clock_imx27.c
	arch/arm/mach-mx2/devices.c
	arch/arm/mach-omap2/board-rx51-peripherals.c
	arch/arm/mach-omap2/board-zoom2.c
	sound/soc/fsl/mpc5200_dma.c
	sound/soc/fsl/mpc5200_dma.h
	sound/soc/fsl/mpc8610_hpcd.c
	sound/soc/pxa/spitz.c
2010-08-16 18:42:58 +01:00
..
clock-imx31.c ASoC: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01:00
clock-imx35.c Merge branch 'for-2.6.36' into for-2.6.37 2010-08-16 18:42:58 +01:00
cpu.c imx: mangle addresses after adding the offset 2010-01-08 16:45:20 +01:00
crm_regs.h imx31: define and use MX31_IO_ADDRESS 2010-01-08 16:41:26 +01:00
devices-imx31.h ARM: imx: dynamically register imx-uart devices (imx31) 2010-06-30 09:00:58 +02:00
devices-imx35.h imx: dynamically register flexcan devices for mx25 and mx35 2010-07-26 15:05:29 +02:00
devices.c Merge branch 'for-2.6.36' into for-2.6.37 2010-08-16 18:42:58 +01:00
devices.h ARM: imx: dynamically register imx-uart devices (imx35) 2010-06-30 09:01:00 +02:00
eukrea_mbimxsd-baseboard.c mbimxsd baseboards : remove unnecessary include 2010-07-26 15:05:32 +02:00
iomux-imx31.c imx31: define and use MX31_IO_ADDRESS 2010-01-08 16:41:26 +01:00
Kconfig Fix KConfig warning 2010-07-26 15:05:33 +02:00
mach-armadillo5x0.c USB: otg/ulpi: extend the generic ulpi driver. 2010-08-10 14:35:40 -07:00
mach-cpuimx35.c eukrea-baseboards: merge includes in one file 2010-07-26 15:05:34 +02:00
mach-kzm_arm11_01.c ARM: imx: dynamically register imx-uart devices (imx31) 2010-06-30 09:00:58 +02:00
mach-mx31_3ds.c mx31_3ds: revert 3ds debug board relate code 2010-07-26 14:29:20 +02:00
mach-mx31ads.c ARM: imx: dynamically register imx-uart devices (imx31) 2010-06-30 09:00:58 +02:00
mach-mx31lilly.c USB: otg/ulpi: extend the generic ulpi driver. 2010-08-10 14:35:40 -07:00
mach-mx31lite.c USB: otg/ulpi: extend the generic ulpi driver. 2010-08-10 14:35:40 -07:00
mach-mx31moboard.c USB: otg/ulpi: extend the generic ulpi driver. 2010-08-10 14:35:40 -07:00
mach-mx35_3ds.c ARM: imx: dynamically register imx-uart devices (imx35) 2010-06-30 09:01:00 +02:00
mach-pcm037.c USB: otg/ulpi: extend the generic ulpi driver. 2010-08-10 14:35:40 -07:00
mach-pcm037_eet.c ARM: imx: dynamically register spi_imx devices (imx35) 2010-06-30 09:00:51 +02:00
mach-pcm043.c USB: otg/ulpi: extend the generic ulpi driver. 2010-08-10 14:35:40 -07:00
mach-qong.c ARM: Fix gen_nand probe structures contents 2010-08-12 02:21:18 +01:00
Makefile Fix KConfig warning 2010-07-26 15:05:33 +02:00
Makefile.boot
mm.c imx: move gpio init after to irq init 2010-07-26 15:05:35 +02:00
mx31lilly-db.c ARM: imx: dynamically register imx-uart devices (imx31) 2010-06-30 09:00:58 +02:00
mx31lite-db.c ARM: imx: dynamically register imx-uart devices (imx31) 2010-06-30 09:00:58 +02:00
mx31moboard-devboard.c ARM: imx: dynamically register imx-uart devices (imx31) 2010-06-30 09:00:58 +02:00
mx31moboard-marxbot.c ARM: mx3: remove paragraphs with old address of the FSF 2010-06-30 09:00:26 +02:00
mx31moboard-smartbot.c USB: otg/ulpi: extend the generic ulpi driver. 2010-08-10 14:35:40 -07:00
pcm037.h