1
0
Fork 0
alistair23-linux/arch/arm/mach-imx
Linus Torvalds 16c1020362 Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm: (161 commits)
  ARM: pxa: fix building issue of missing physmap.h
  ARM: mmp: PXA910 drive strength FAST using wrong value
  ARM: mmp: MMP2 drive strength FAST using wrong value
  ARM: pxa: fix recursive calls in pxa_low_gpio_chip
  AT91: Support for gsia18s board
  AT91: Acme Systems FOX Board G20 board files
  AT91: board-sam9m10g45ek.c: Remove duplicate inclusion of mach/hardware.h
  ARM: pxa: fix suspend/resume array index miscalculation
  ARM: pxa: use cpu_has_ipr() consistently in irq.c
  ARM: pxa: remove unused variable in clock-pxa3xx.c
  ARM: pxa: fix warning in zeus.c
  ARM: sa1111: fix typo in sa1111_retrigger_lowirq()
  ARM mxs: clkdev related compile fixes
  ARM i.MX mx31_3ds: Fix MC13783 regulator names
  ARM: plat-stmp3xxx: irq_data conversion.
  ARM: plat-spear: irq_data conversion.
  ARM: plat-orion: irq_data conversion.
  ARM: plat-omap: irq_data conversion.
  ARM: plat-nomadik: irq_data conversion.
  ARM: plat-mxc: irq_data conversion.
  ...

Fix up trivial conflict in arch/arm/plat-omap/gpio.c (Lennert
Buytenhek's irq_data conversion clashing with some omap irq updates)
2011-01-15 12:33:40 -08:00
..
include/mach dmaengine: Add Freescale i.MX SDMA support 2010-10-05 15:49:26 -07:00
Kconfig ARM: imx/mx27_3ds: Add debug board support 2011-01-11 11:44:16 +01:00
Makefile ARM: imx: move mx25 support to mach-imx 2010-11-19 21:53:49 +01:00
Makefile.boot ARM: imx: move mx25 support to mach-imx 2010-11-19 21:53:49 +01:00
clock-imx1.c ARM: 6483/1: arm & sh: factorised duplicated clkdev.c 2010-11-26 10:51:04 +00:00
clock-imx21.c Merge branch 'devel-stable' into devel 2011-01-06 22:33:32 +00:00
clock-imx25.c Merge branch 'devel-stable' into devel 2011-01-06 22:33:32 +00:00
clock-imx27.c Merge branch 'devel-stable' into devel 2011-01-06 22:33:32 +00:00
cpu-imx27.c ARM: imx: Get the silicon version from the IIM module 2010-11-28 19:51:47 +01:00
devices-imx1.h ARM: imx: fix name of macros to add imx-i2c devices 2010-10-01 09:32:09 +02:00
devices-imx21.h ARM: imx: dynamically allocate imx21-hcd devices 2010-11-17 10:01:33 +01:00
devices-imx25.h Merge commit 'v2.6.37-rc4' into imx-for-2.6.38 2010-12-06 09:36:17 +01:00
devices-imx27.h ARM: imx: dynamically allocate imx-keypad devices 2010-11-17 10:01:32 +01:00
dma-v1.c arm: dma: check clk_get() result 2010-12-03 11:05:12 +01:00
eukrea_mbimx27-baseboard.c Merge commit 'v2.6.37-rc4' into imx-for-2.6.38 2010-12-06 09:36:17 +01:00
eukrea_mbimxsd25-baseboard.c ARM: i.MX IOMUX-V3 replace struct pad_desc with bitmapped cookie 2010-11-24 09:56:58 +01:00
mach-cpuimx27.c ARM: imx: remove now empty devices.h 2010-11-17 10:01:34 +01:00
mach-eukrea_cpuimx25.c ARM: i.MX IOMUX-V3 replace struct pad_desc with bitmapped cookie 2010-11-24 09:56:58 +01:00
mach-imx27_visstrim_m10.c ARM: imx: remove now empty devices.h 2010-11-17 10:01:34 +01:00
mach-imx27lite.c ARM: imx: remove now empty devices.h 2010-11-17 10:01:34 +01:00
mach-mx1ads.c ARM: imx: remove now empty devices.h 2010-11-17 10:01:34 +01:00
mach-mx21ads.c ARM: imx: remove now empty devices.h 2010-11-17 10:01:34 +01:00
mach-mx25_3ds.c ARM: imx/mx25_3ds: Add USB support 2011-01-03 10:17:12 +01:00
mach-mx27_3ds.c ARM: imx/mx27_3ds: Add debug board support 2011-01-11 11:44:16 +01:00
mach-mx27ads.c ARM: imx: remove now empty devices.h 2010-11-17 10:01:34 +01:00
mach-mxt_td60.c ARM: imx: remove now empty devices.h 2010-11-17 10:01:34 +01:00
mach-pca100.c ARM: imx: remove now empty devices.h 2010-11-17 10:01:34 +01:00
mach-pcm038.c Change the register name definitions for mc13783 2011-01-12 14:33:03 +00:00
mach-scb9328.c ARM: imx: remove now empty devices.h 2010-11-17 10:01:34 +01:00
mm-imx1.c ARM: imx: use MXxy_IO_P2V macros to setup static mappings 2010-11-17 08:58:09 +01:00
mm-imx21.c ARM: imx: use MXxy_IO_P2V macros to setup static mappings 2010-11-17 08:58:09 +01:00
mm-imx25.c ARM: imx: move mx25 support to mach-imx 2010-11-19 21:53:49 +01:00
mm-imx27.c ARM: imx: use MXxy_IO_P2V macros to setup static mappings 2010-11-17 08:58:09 +01: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
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