lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Files
ba6fa29c6dd51a1245a109f4b460092b51cad0f0
linux-kernel-test/arch/arm/mach-imx
History
Linus Torvalds eaed435a7b Merge tag 'arm-soc-imx-move' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 
Consolidate i.MX 5 platforms to be under the new shared i.MX 3/5/6 tree.

* tag 'arm-soc-imx-move' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM i.MX: Update defconfig
  ARM i.MX: Merge i.MX5 support into mach-imx
  ARM i.MX5: remove unnecessary includes from board files

Fix up fairly trivial conflicts due to various changes nearby in
arch/arm/{mach,plat}-imx/{Kconfig,Makefile}

Pull request had been sent to the wrong email address, but happened
before the merge window closed.  I'm merging the MX 5 consolidation,
since it apparently will help the next development window and will avoid
conflicts later as per Arnd.
2012-01-23 14:50:30 -08:00
..
include/mach
…
clock-imx1.c
…
clock-imx6q.c
ARM: 7198/1: arm/imx6: add restart support for imx6q
2012-01-05 12:57:22 +00:00
clock-imx21.c
…
clock-imx25.c
…
clock-imx27.c
…
clock-imx31.c
…
clock-imx35.c
clock-imx35: fix reboot in internal boot mode
2011-12-19 12:26:08 +01:00
clock-mx51-mx53.c
Merge tag 'arm-soc-imx-move' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-01-23 14:50:30 -08:00
cpu_op-mx51.c
ARM i.MX: Merge i.MX5 support into mach-imx
2011-11-16 08:37:37 +01:00
cpu_op-mx51.h
ARM i.MX: Merge i.MX5 support into mach-imx
2011-11-16 08:37:37 +01:00
cpu-imx5.c
Merge tag 'arm-soc-imx-move' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-01-23 14:50:30 -08:00
cpu-imx25.c
…
cpu-imx27.c
…
cpu-imx31.c
…
cpu-imx35.c
…
crm-regs-imx5.h
ARM i.MX: Merge i.MX5 support into mach-imx
2011-11-16 08:37:37 +01:00
crmregs-imx31.h
…
devices-imx1.h
…
devices-imx21.h
…
devices-imx25.h
…
devices-imx27.h
…
devices-imx31.h
…
devices-imx35.h
…
devices-imx50.h
ARM i.MX: Merge i.MX5 support into mach-imx
2011-11-16 08:37:37 +01:00
devices-imx51.h
ARM i.MX: Merge i.MX5 support into mach-imx
2011-11-16 08:37:37 +01:00
devices-imx53.h
ARM i.MX: Merge i.MX5 support into mach-imx
2011-11-16 08:37:37 +01:00
dma-v1.c
…
efika.h
ARM i.MX: Merge i.MX5 support into mach-imx
2011-11-16 08:37:37 +01:00
ehci-imx5.c
ARM i.MX: Merge i.MX5 support into mach-imx
2011-11-16 08:37:37 +01:00
ehci-imx25.c
…
ehci-imx27.c
…
ehci-imx31.c
…
ehci-imx35.c
…
eukrea_mbimx27-baseboard.c
…
eukrea_mbimx51-baseboard.c
ARM i.MX: Merge i.MX5 support into mach-imx
2011-11-16 08:37:37 +01:00
eukrea_mbimxsd25-baseboard.c
…
eukrea_mbimxsd35-baseboard.c
…
eukrea_mbimxsd-baseboard.c
ARM i.MX: Merge i.MX5 support into mach-imx
2011-11-16 08:37:37 +01:00
gpc.c
…
head-v7.S
Merge branch 'imx/pm2' of git://git.linaro.org/people/shawnguo/linux-2.6 into imx6/pm
2012-01-06 12:44:05 -08:00
hotplug.c
…
imx51-dt.c
Merge tag 'arm-soc-imx-move' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-01-23 14:50:30 -08:00
imx53-dt.c
Merge tag 'arm-soc-imx-move' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-01-23 14:50:30 -08:00
iomux-imx31.c
…
Kconfig
Merge tag 'arm-soc-imx-move' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-01-23 14:50:30 -08:00
lluart.c
…
localtimer.c
…
mach-apf9328.c
Merge branch 'samsung/cleanup' into next/boards
2012-01-09 17:06:36 +00:00
mach-armadillo5x0.c
ARM: restart: mxc: use new restart hook
2012-01-05 12:57:15 +00:00
mach-bug.c
ARM: restart: mxc: use new restart hook
2012-01-05 12:57:15 +00:00
mach-cpuimx27.c
ARM: restart: mxc: use new restart hook
2012-01-05 12:57:15 +00:00
mach-cpuimx35.c
Merge branch 'restart' into for-linus
2012-01-05 13:25:27 +00:00
mach-cpuimx51.c
Merge tag 'arm-soc-imx-move' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-01-23 14:50:30 -08:00
mach-cpuimx51sd.c
Merge tag 'arm-soc-imx-move' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-01-23 14:50:30 -08:00
mach-eukrea_cpuimx25.c
ARM: restart: mxc: use new restart hook
2012-01-05 12:57:15 +00:00
mach-imx6q.c
Merge branch 'samsung/cleanup' into next/boards
2012-01-09 17:06:36 +00:00
mach-imx27_visstrim_m10.c
ARM: restart: mxc: use new restart hook
2012-01-05 12:57:15 +00:00
mach-imx27ipcam.c
ARM: restart: mxc: use new restart hook
2012-01-05 12:57:15 +00:00
mach-imx27lite.c
ARM: restart: mxc: use new restart hook
2012-01-05 12:57:15 +00:00
mach-kzm_arm11_01.c
ARM: restart: mxc: use new restart hook
2012-01-05 12:57:15 +00:00
mach-mx1ads.c
ARM: restart: mxc: use new restart hook
2012-01-05 12:57:15 +00:00
mach-mx21ads.c
ARM: restart: mxc: use new restart hook
2012-01-05 12:57:15 +00:00
mach-mx25_3ds.c
ARM: restart: mxc: use new restart hook
2012-01-05 12:57:15 +00:00
mach-mx27_3ds.c
ARM: restart: mxc: use new restart hook
2012-01-05 12:57:15 +00:00
mach-mx27ads.c
ARM: restart: mxc: use new restart hook
2012-01-05 12:57:15 +00:00
mach-mx31_3ds.c
ARM: Add arm_memblock_steal() to allocate memory away from the kernel
2012-01-13 15:02:35 +00:00
mach-mx31ads.c
ARM: restart: mxc: use new restart hook
2012-01-05 12:57:15 +00:00
mach-mx31lilly.c
ARM: restart: mxc: use new restart hook
2012-01-05 12:57:15 +00:00
mach-mx31lite.c
ARM: restart: mxc: use new restart hook
2012-01-05 12:57:15 +00:00
mach-mx31moboard.c
ARM: Add arm_memblock_steal() to allocate memory away from the kernel
2012-01-13 15:02:35 +00:00
mach-mx35_3ds.c
ARM: restart: mxc: use new restart hook
2012-01-05 12:57:15 +00:00
mach-mx50_rdp.c
Merge tag 'arm-soc-imx-move' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-01-23 14:50:30 -08:00
mach-mx51_3ds.c
Merge tag 'arm-soc-imx-move' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-01-23 14:50:30 -08:00
mach-mx51_babbage.c
Merge tag 'arm-soc-imx-move' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-01-23 14:50:30 -08:00
mach-mx51_efikamx.c
Merge tag 'arm-soc-imx-move' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-01-23 14:50:30 -08:00
mach-mx51_efikasb.c
Merge tag 'arm-soc-imx-move' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-01-23 14:50:30 -08:00
mach-mx53_ard.c
Merge tag 'arm-soc-imx-move' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-01-23 14:50:30 -08:00
mach-mx53_evk.c
Merge tag 'arm-soc-imx-move' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-01-23 14:50:30 -08:00
mach-mx53_loco.c
Merge tag 'arm-soc-imx-move' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-01-23 14:50:30 -08:00
mach-mx53_smd.c
Merge tag 'arm-soc-imx-move' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-01-23 14:50:30 -08:00
mach-mxt_td60.c
ARM: restart: mxc: use new restart hook
2012-01-05 12:57:15 +00:00
mach-pca100.c
ARM: restart: mxc: use new restart hook
2012-01-05 12:57:15 +00:00
mach-pcm037_eet.c
…
mach-pcm037.c
ARM: Add arm_memblock_steal() to allocate memory away from the kernel
2012-01-13 15:02:35 +00:00
mach-pcm038.c
ARM: restart: mxc: use new restart hook
2012-01-05 12:57:15 +00:00
mach-pcm043.c
ARM: restart: mxc: use new restart hook
2012-01-05 12:57:15 +00:00
mach-qong.c
ARM: restart: mxc: use new restart hook
2012-01-05 12:57:15 +00:00
mach-scb9328.c
ARM: restart: mxc: use new restart hook
2012-01-05 12:57:15 +00:00
mach-vpr200.c
ARM: restart: mxc: use new restart hook
2012-01-05 12:57:15 +00:00
Makefile
Merge tag 'arm-soc-imx-move' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-01-23 14:50:30 -08:00
Makefile.boot
Merge tag 'arm-soc-imx-move' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-01-23 14:50:30 -08:00
mm-imx1.c
…
mm-imx3.c
Merge branch 'cleanups/assorted' into imx-fixes-for-arnd
2011-11-22 11:32:39 +01:00
mm-imx5.c
Merge tag 'arm-soc-imx-move' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-01-23 14:50:30 -08:00
mm-imx21.c
…
mm-imx25.c
…
mm-imx27.c
…
mmdc.c
…
mx1-camera-fiq-ksym.c
…
mx1-camera-fiq.S
…
mx31lilly-db.c
…
mx31lite-db.c
…
mx31moboard-devboard.c
…
mx31moboard-marxbot.c
…
mx31moboard-smartbot.c
…
mx51_efika.c
ARM i.MX: Merge i.MX5 support into mach-imx
2011-11-16 08:37:37 +01:00
pcm037.h
…
pcm970-baseboard.c
…
platsmp.c
…
pm-imx5.c
Merge tag 'arm-soc-imx-move' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2012-01-23 14:50:30 -08:00
pm-imx6q.c
ARM: imx6q: resume PL310 only when CACHE_L2X0 defined
2011-12-26 10:18:59 +08:00
pm-imx27.c
…
src.c
Merge branch 'fixes-for-arm-soc' of git://sources.calxeda.com/kernel/linux into fixes
2012-01-16 22:46:06 -08:00