kernel/linux
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ synced 2026-11-13 07:31:07 +00:00
Code Issues Releases Packages Activity

Merge branches 'features/assorted', 'features/imx-pata' and 'features/imx-multi-irq-v2' into imx-features

Browse source 
Conflicts:
	arch/arm/plat-mxc/avic.c
	arch/arm/plat-mxc/include/mach/common.h

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Sascha Hauer 2011-09-29 10:40:29 +02:00
commit ca4e419c20
52 changed files with 215 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

1
arch/arm/Kconfig
View file

1
arch/arm/mach-imx/Kconfig
View file

1
arch/arm/mach-imx/mach-apf9328.c
View file

1
arch/arm/mach-imx/mach-armadillo5x0.c
View file

1
arch/arm/mach-imx/mach-bug.c
View file

1
arch/arm/mach-imx/mach-cpuimx27.c
View file

1
arch/arm/mach-imx/mach-cpuimx35.c
View file

1
arch/arm/mach-imx/mach-eukrea_cpuimx25.c
View file

1
arch/arm/mach-imx/mach-imx27_visstrim_m10.c
View file

1
arch/arm/mach-imx/mach-imx27ipcam.c
View file

1
arch/arm/mach-imx/mach-imx27lite.c
View file

1
arch/arm/mach-imx/mach-kzm_arm11_01.c
View file

2
arch/arm/mach-imx/mach-mx1ads.c
View file

1
arch/arm/mach-imx/mach-mx21ads.c
View file

1
arch/arm/mach-imx/mach-mx25_3ds.c
View file

1
arch/arm/mach-imx/mach-mx27_3ds.c
View file

1
arch/arm/mach-imx/mach-mx27ads.c
View file

1
arch/arm/mach-imx/mach-mx31_3ds.c
View file

1
arch/arm/mach-imx/mach-mx31ads.c
View file

1
arch/arm/mach-imx/mach-mx31lilly.c
View file

1
arch/arm/mach-imx/mach-mx31lite.c
View file

18
arch/arm/mach-imx/mach-mx31moboard.c
View file

1
arch/arm/mach-imx/mach-mx35_3ds.c
View file

1
arch/arm/mach-imx/mach-mxt_td60.c
View file

1
arch/arm/mach-imx/mach-pca100.c
View file

1
arch/arm/mach-imx/mach-pcm037.c
View file

1
arch/arm/mach-imx/mach-pcm038.c
View file

1
arch/arm/mach-imx/mach-pcm043.c
View file

2
arch/arm/mach-imx/mach-qong.c
View file

1
arch/arm/mach-imx/mach-scb9328.c
View file

1
arch/arm/mach-imx/mach-vpr200.c
View file

1
arch/arm/mach-mx5/board-cpuimx51.c
View file

1
arch/arm/mach-mx5/board-cpuimx51sd.c
View file

1
arch/arm/mach-mx5/board-mx50_rdp.c
View file

1
arch/arm/mach-mx5/board-mx51_3ds.c
View file

1
arch/arm/mach-mx5/board-mx51_babbage.c
View file

12
arch/arm/mach-mx5/board-mx51_efikamx.c
View file

19
arch/arm/mach-mx5/board-mx51_efikasb.c
View file

1
arch/arm/mach-mx5/board-mx53_ard.c
View file

1
arch/arm/mach-mx5/board-mx53_evk.c
View file

1
arch/arm/mach-mx5/board-mx53_loco.c
View file

1
arch/arm/mach-mx5/board-mx53_smd.c
View file

1
arch/arm/mach-mx5/mx51_efika.c
View file

91
arch/arm/plat-mxc/avic.c
View file

2
arch/arm/plat-mxc/devices/platform-pata_imx.c
View file

14
arch/arm/plat-mxc/include/mach/common.h
View file

58
arch/arm/plat-mxc/include/mach/entry-macro.S
View file

1
arch/arm/plat-mxc/include/mach/iomux-mx3.h
View file

1
arch/arm/plat-mxc/include/mach/mx25.h
View file

21
arch/arm/plat-mxc/irq-common.c
View file

3
arch/arm/plat-mxc/irq-common.h
View file

32
arch/arm/plat-mxc/tzic.c
View file