1
0
Fork 0
alistair23-linux/arch/arm/plat-mxc
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
..
devices ARM: mx5: dynamically allocate imx-keypad devices 2011-01-12 14:50:45 +01:00
include/mach Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-01-15 12:33:40 -08:00
3ds_debugboard.c ARM: plat-mxc: irq_data conversion. 2011-01-13 17:19:09 +01:00
Kconfig ARM i.MX51: Make CONFIG_MXC_TZIC an invisible option 2010-11-24 10:08:59 +01:00
Makefile mx51: support FIQ on TZIC, revised 2010-12-14 09:54:37 +01:00
audmux-v1.c ARM: mxc: remove paragraphs with old address of the FSF 2010-06-30 09:00:28 +02:00
audmux-v2.c ARM: imx: use SOC_IMX25 instead of ARCH_MX25 for multi-SoC 2010-11-19 21:54:34 +01:00
avic.c ARM: plat-mxc: irq_data conversion. 2011-01-13 17:19:09 +01:00
clock.c arm: mxc: utilise usecount field in clock operations 2010-07-26 14:17:57 +02:00
cpu.c [ARM] MXC: add cpu_is_ macros 2009-03-13 10:34:26 +01:00
cpufreq.c Fix imx cpufreq driver as module 2010-12-14 09:54:38 +01:00
devices.c ARM: imx: allow specifying a dma mask when creating a platform device 2010-11-17 10:01:21 +01:00
ehci.c MX51: Add support for usb host 2 2011-01-03 10:20:23 +01:00
epit.c ARM: mxc: update clock source registration 2010-12-22 22:44:39 +00:00
gpio.c ARM: plat-mxc: irq_data conversion. 2011-01-13 17:19:09 +01:00
iomux-v1.c arm/imx/iomux-v1: check for invalid modes in mxc_gpio_mode 2010-02-24 10:07:16 +01:00
iomux-v3.c MXC IOMUX-V3 replace struct pad_desc with bitmapped cookie (step 2) 2010-12-15 12:42:49 +01:00
iram_alloc.c ARM: imx: Add iram allocator functions 2010-10-19 18:44:57 +02:00
irq-common.c mx51: support FIQ on TZIC, revised 2010-12-14 09:54:37 +01:00
irq-common.h mx51: support FIQ on TZIC, revised 2010-12-14 09:54:37 +01:00
pwm.c mx51: add support for pwm 2011-01-13 14:03:58 +01:00
ssi-fiq-ksym.c ASoC: Add a new imx-ssi sound driver 2010-01-17 11:09:46 +00:00
ssi-fiq.S ASoC: Add a new imx-ssi sound driver 2010-01-17 11:09:46 +00:00
system.c watchdog: imx: use clk_get to acquire the watchdog clock 2010-12-14 09:54:19 +01:00
time.c ARM: mxc: update clock source registration 2010-12-22 22:44:39 +00:00
tzic.c ARM: plat-mxc: irq_data conversion. 2011-01-13 17:19:09 +01:00
ulpi.c MXC: Add support for ULPI Viewports 2009-11-14 10:29:15 +01:00