q3k
/
linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
linux/arch/arm/mach-imx
History
Linus Torvalds 1fdb24e969 Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm 
* 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: (178 commits)
  ARM: 7139/1: fix compilation with CONFIG_ARM_ATAG_DTB_COMPAT and large TEXT_OFFSET
  ARM: gic, local timers: use the request_percpu_irq() interface
  ARM: gic: consolidate PPI handling
  ARM: switch from NO_MACH_MEMORY_H to NEED_MACH_MEMORY_H
  ARM: mach-s5p64x0: remove mach/memory.h
  ARM: mach-s3c64xx: remove mach/memory.h
  ARM: plat-mxc: remove mach/memory.h
  ARM: mach-prima2: remove mach/memory.h
  ARM: mach-zynq: remove mach/memory.h
  ARM: mach-bcmring: remove mach/memory.h
  ARM: mach-davinci: remove mach/memory.h
  ARM: mach-pxa: remove mach/memory.h
  ARM: mach-ixp4xx: remove mach/memory.h
  ARM: mach-h720x: remove mach/memory.h
  ARM: mach-vt8500: remove mach/memory.h
  ARM: mach-s5pc100: remove mach/memory.h
  ARM: mach-tegra: remove mach/memory.h
  ARM: plat-tcc: remove mach/memory.h
  ARM: mach-mmp: remove mach/memory.h
  ARM: mach-cns3xxx: remove mach/memory.h
  ...

Fix up mostly pretty trivial conflicts in:
 - arch/arm/Kconfig
 - arch/arm/include/asm/localtimer.h
 - arch/arm/kernel/Makefile
 - arch/arm/mach-shmobile/board-ap4evb.c
 - arch/arm/mach-u300/core.c
 - arch/arm/mm/dma-mapping.c
 - arch/arm/mm/proc-v7.S
 - arch/arm/plat-omap/Kconfig
largely due to some CONFIG option renaming (ie CONFIG_PM_SLEEP ->
CONFIG_ARM_CPU_SUSPEND for the arm-specific suspend code etc) and
addition of NEED_MACH_MEMORY_H next to HAVE_IDE.
 		2011-10-28 12:02:27 -07:00
..
include/mach dmaengine: Add Freescale i.MX SDMA support 2010-10-05 15:49:26 -07:00
Kconfig ARM: mach-imx/mx27_3ds: Add LCD support 2011-07-07 10:01:10 +02:00
Makefile ARM: imx: move mx3 support to mach-imx 2011-05-19 13:11:38 +02:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
cache-l2x0.c ARM: imx: move mx3 support to mach-imx 2011-05-19 13:11:38 +02:00
clock-imx1.c serial/imx: get rid of the uses of cpu_is_mx1() 2011-07-27 09:30:38 +08:00
clock-imx21.c serial/imx: get rid of the uses of cpu_is_mx1() 2011-07-27 09:30:38 +08:00
clock-imx25.c Merge commit 'v3.1-rc1' into imx-fixes 2011-08-08 08:22:41 +02:00
clock-imx27.c net/fec: gasket needs to be enabled for some i.mx 2011-07-27 09:30:50 +08:00
clock-imx31.c dmaengine: imx-sdma: use platform_device_id to identify sdma version 2011-07-27 09:31:45 +08:00
clock-imx35.c dmaengine: imx-sdma: use platform_device_id to identify sdma version 2011-07-27 09:31:45 +08:00
cpu-imx27.c ARM: imx: Get the silicon version from the IIM module 2010-11-28 19:51:47 +01:00
cpu-imx31.c ARM: imx: move mx3 support to mach-imx 2011-05-19 13:11:38 +02:00
cpu-imx35.c ARM: imx: move mx3 support to mach-imx 2011-05-19 13:11:38 +02:00
crmregs-imx31.h ARM: imx: move mx3 support to mach-imx 2011-05-19 13:11:38 +02:00
devices-imx1.h ARM: imx: clean up the section marks of extern data 2011-05-19 13:11:11 +02:00
devices-imx21.h ARM: imx: clean up the section marks of extern data 2011-05-19 13:11:11 +02:00
devices-imx25.h ARM: imx: clean up the section marks of extern data 2011-05-19 13:11:11 +02:00
devices-imx27.h ARM: imx: clean up the section marks of extern data 2011-05-19 13:11:11 +02:00
devices-imx31.h ARM: imx: move mx3 support to mach-imx 2011-05-19 13:11:38 +02:00
devices-imx35.h ARM: imx: move mx3 support to mach-imx 2011-05-19 13:11:38 +02:00
dma-v1.c Merge branch 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-25 12:38:42 -07:00
ehci-imx25.c ARM i.MX ehci: factor out soc specific functions 2011-02-11 08:34:17 +01:00
ehci-imx27.c ARM i.MX ehci: factor out soc specific functions 2011-02-11 08:34:17 +01:00
ehci-imx31.c ARM: imx: move mx3 support to mach-imx 2011-05-19 13:11:38 +02:00
ehci-imx35.c ARM: imx: move mx3 support to mach-imx 2011-05-19 13:11:38 +02:00
eukrea_mbimx27-baseboard.c ARM: imx: convert to new leds-gpio registration helper 2011-07-07 09:59:57 +02:00
eukrea_mbimxsd25-baseboard.c mmc: sdhci-esdhc-imx: extend card_detect and write_protect support for mx5 2011-07-27 09:31:14 +08:00
eukrea_mbimxsd35-baseboard.c mmc: sdhci-esdhc-imx: extend card_detect and write_protect support for mx5 2011-07-27 09:31:14 +08:00
iomux-imx31.c ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h 2011-08-08 14:27:41 +01:00
mach-apf9328.c Merge branch 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-25 12:38:42 -07:00
mach-armadillo5x0.c ARM: mach-imx: convert boot_params to atag_offset 2011-08-21 17:14:51 -04:00
mach-bug.c gpio/mxc: Change gpio-mxc into an upstanding gpio driver 2011-06-06 10:01:19 -06:00
mach-cpuimx27.c Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6-wd into devel-stable 2011-09-16 21:45:16 +01:00
mach-cpuimx35.c Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6-wd into devel-stable 2011-09-16 21:45:16 +01:00
mach-eukrea_cpuimx25.c Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6-wd into devel-stable 2011-09-16 21:45:16 +01:00
mach-imx27_visstrim_m10.c ARM: mach-imx: convert boot_params to atag_offset 2011-08-21 17:14:51 -04:00
mach-imx27ipcam.c ARM: mach-imx: convert boot_params to atag_offset 2011-08-21 17:14:51 -04:00
mach-imx27lite.c ARM: mach-imx: convert boot_params to atag_offset 2011-08-21 17:14:51 -04:00
mach-kzm_arm11_01.c ARM: mach-imx: convert boot_params to atag_offset 2011-08-21 17:14:51 -04:00
mach-mx1ads.c ARM: mach-imx: convert boot_params to atag_offset 2011-08-21 17:14:51 -04:00
mach-mx21ads.c ARM: mach-imx: convert boot_params to atag_offset 2011-08-21 17:14:51 -04:00
mach-mx25_3ds.c ARM: mach-imx: convert boot_params to atag_offset 2011-08-21 17:14:51 -04:00
mach-mx27_3ds.c ARM: mach-imx: convert boot_params to atag_offset 2011-08-21 17:14:51 -04:00
mach-mx27ads.c Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm 2011-10-28 12:02:27 -07:00
mach-mx31_3ds.c ARM: mach-imx: convert boot_params to atag_offset 2011-08-21 17:14:51 -04:00
mach-mx31ads.c ARM: mach-imx: convert boot_params to atag_offset 2011-08-21 17:14:51 -04:00
mach-mx31lilly.c ARM: mach-imx: convert boot_params to atag_offset 2011-08-21 17:14:51 -04:00
mach-mx31lite.c ARM: mach-imx: convert boot_params to atag_offset 2011-08-21 17:14:51 -04:00
mach-mx31moboard.c ARM: mach-imx: convert boot_params to atag_offset 2011-08-21 17:14:51 -04:00
mach-mx35_3ds.c ARM: mach-imx: convert boot_params to atag_offset 2011-08-21 17:14:51 -04:00
mach-mxt_td60.c ARM: mach-imx: convert boot_params to atag_offset 2011-08-21 17:14:51 -04:00
mach-pca100.c ARM: mach-imx: convert boot_params to atag_offset 2011-08-21 17:14:51 -04:00
mach-pcm037.c ARM: mach-imx: convert boot_params to atag_offset 2011-08-21 17:14:51 -04:00
mach-pcm037_eet.c ARM: imx: move mx3 support to mach-imx 2011-05-19 13:11:38 +02:00
mach-pcm038.c ARM: mach-imx: convert boot_params to atag_offset 2011-08-21 17:14:51 -04:00
mach-pcm043.c ARM: mach-imx: convert boot_params to atag_offset 2011-08-21 17:14:51 -04:00
mach-qong.c ARM: mach-imx: convert boot_params to atag_offset 2011-08-21 17:14:51 -04:00
mach-scb9328.c ARM: mach-imx: convert boot_params to atag_offset 2011-08-21 17:14:51 -04:00
mach-vpr200.c gpio/mxc: Change gpio-mxc into an upstanding gpio driver 2011-06-06 10:01:19 -06:00
mm-imx1.c gpio/mxc: get rid of the uses of cpu_is_mx() 2011-07-08 12:38:12 -06:00
mm-imx21.c Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-26 17:41:04 -07:00
mm-imx25.c dmaengine: imx-sdma: use platform_device_id to identify sdma version 2011-07-27 09:31:45 +08:00
mm-imx27.c Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-26 17:41:04 -07:00
mm-imx31.c dmaengine: imx-sdma: use platform_device_id to identify sdma version 2011-07-27 09:31:45 +08:00
mm-imx35.c dmaengine: imx-sdma: use platform_device_id to identify sdma version 2011-07-27 09:31:45 +08: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
mx31lilly-db.c ARM: imx: move mx3 support to mach-imx 2011-05-19 13:11:38 +02:00
mx31lite-db.c ARM: imx: convert to new leds-gpio registration helper 2011-07-07 09:59:57 +02:00
mx31moboard-devboard.c ARM: imx: move mx3 support to mach-imx 2011-05-19 13:11:38 +02:00
mx31moboard-marxbot.c ARM: imx: move mx3 support to mach-imx 2011-05-19 13:11:38 +02:00
mx31moboard-smartbot.c ARM: imx: move mx3 support to mach-imx 2011-05-19 13:11:38 +02:00
pcm037.h ARM: imx: move mx3 support to mach-imx 2011-05-19 13:11:38 +02:00
pcm970-baseboard.c ARM: imx: remove now empty devices.h 2010-11-17 10:01:34 +01:00
pm-imx27.c Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-01-13 10:05:56 -08:00