kevin/linux
1
Fork 0
Code
4cffaf7336
linux/arch/arm/mach-mx5
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
..
board-cpuimx51.c ARM: mach-mx5: convert boot_params to atag_offset 2011-08-21 17:15:01 -04:00
board-cpuimx51sd.c ARM: mach-mx5: convert boot_params to atag_offset 2011-08-21 17:15:01 -04:00
board-mx50_rdp.c gpio/mxc: Change gpio-mxc into an upstanding gpio driver 2011-06-06 10:01:19 -06:00
board-mx51_3ds.c ARM: mach-mx5: convert boot_params to atag_offset 2011-08-21 17:15:01 -04:00
board-mx51_babbage.c ARM: mach-mx5: convert boot_params to atag_offset 2011-08-21 17:15:01 -04:00
board-mx51_efikamx.c ARM: mach-mx5: convert boot_params to atag_offset 2011-08-21 17:15:01 -04:00
board-mx51_efikasb.c ARM: mach-mx5: convert boot_params to atag_offset 2011-08-21 17:15:01 -04:00
board-mx53_ard.c ARM: mach-mx5/mx53_ard: Add gpio_keys support 2011-07-07 10:01:14 +02:00
board-mx53_evk.c ARM: mx5/mx53_evk: Add support for LED 2011-07-07 10:01:06 +02:00
board-mx53_loco.c mmc: sdhci-esdhc-imx: extend card_detect and write_protect support for mx5 2011-07-27 09:31:14 +08:00
board-mx53_smd.c gpio/mxc: Change gpio-mxc into an upstanding gpio driver 2011-06-06 10:01:19 -06:00
clock-mx51-mx53.c Merge commit 'v3.1-rc1' into imx-fixes 2011-08-08 08:22:41 +02:00
cpu_op-mx51.c cpufreq for freescale mx51 2010-10-22 08:24:14 +02:00
cpu_op-mx51.h cpufreq for freescale mx51 2010-10-22 08:24:14 +02:00
cpu.c ARM: mx53: Print silicon revision on boot 2011-05-19 13:11:00 +02:00
crm_regs.h ARM: mx53: Add support for missing UARTs 2011-07-07 10:01:12 +02:00
devices-imx50.h ARM: imx: clean up the section marks of extern data 2011-05-19 13:11:11 +02:00
devices-imx51.h ARM: mx51: Remove imx51_add_gpio_keys 2011-05-19 13:11:25 +02:00
devices-imx53.h ARM: mx53: Add keypad support 2011-07-07 10:01:13 +02:00
devices.c gpio/mxc: Change gpio-mxc into an upstanding gpio driver 2011-06-06 10:01:19 -06:00
devices.h ARM: mx5: dynamically allocate imx-keypad devices 2011-01-12 14:50:45 +01:00
efika.h efikamx: add usb h1 support 2011-02-18 10:56:38 +01:00
ehci.c ARM i.MX ehci: factor out soc specific functions 2011-02-11 08:34:17 +01:00
eukrea_mbimx51-baseboard.c ARM i.MX: get rid of wrong MXC_INTERNAL_IRQ usage 2011-07-07 10:00:00 +02:00
eukrea_mbimxsd-baseboard.c ARM: mx5: convert to new leds-gpio registration helper 2011-07-07 09:59:57 +02:00
Kconfig ARM: mach-mx5/mx53_ard: Add gpio_keys support 2011-07-07 10:01:14 +02:00
Makefile ARM: mx51: Add support for low power suspend on MX51 2011-07-07 10:01:10 +02:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
mm-mx50.c gpio/mxc: get rid of the uses of cpu_is_mx() 2011-07-08 12:38:12 -06:00
mm.c dmaengine: imx-sdma: use platform_device_id to identify sdma version 2011-07-27 09:31:45 +08:00
mx51_efika.c Merge commit 'v3.1-rc1' into imx-fixes 2011-08-08 08:22:41 +02:00
pm-imx5.c ARM: mx51: Add support for low power suspend on MX51 2011-07-07 10:01:10 +02:00
system.c ARM: mx51: Implement code to allow mx51 to enter WFI 2011-03-23 15:08:15 +01:00