linux/arch/arm/plat-mxc
Linus Torvalds 411f5c7a50 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: (289 commits)
  davinci: DM644x EVM: register MUSB device earlier
  davinci: add spi devices on tnetv107x evm
  davinci: add ssp config for tnetv107x evm board
  davinci: add tnetv107x ssp platform device
  spi: add ti-ssp spi master driver
  mfd: add driver for sequencer serial port
  ARM: EXYNOS4: Implement Clock gating for System MMU
  ARM: EXYNOS4: Enhancement of System MMU driver
  ARM: EXYNOS4: Add support for gpio interrupts
  ARM: S5P: Add function to register gpio interrupt bank data
  ARM: S5P: Cleanup S5P gpio interrupt code
  ARM: EXYNOS4: Add missing GPYx banks
  ARM: S3C64XX: Fix section mismatch from cpufreq init
  ARM: EXYNOS4: Add keypad device to the SMDKV310
  ARM: EXYNOS4: Update clocks for keypad
  ARM: EXYNOS4: Update keypad base address
  ARM: EXYNOS4: Add keypad device helpers
  ARM: EXYNOS4: Add support for SATA on ARMLEX4210
  plat-nomadik: make GPIO interrupts work with cpuidle ApSleep
  mach-u300: define a dummy filter function for coh901318
  ...

Fix up various conflicts in
 - arch/arm/mach-exynos4/cpufreq.c
 - arch/arm/mach-mxs/gpio.c
 - drivers/net/Kconfig
 - drivers/tty/serial/Kconfig
 - drivers/tty/serial/Makefile
 - drivers/usb/gadget/fsl_mxc_udc.c
 - drivers/video/Kconfig
2011-03-17 19:08:06 -07:00
..
devices ARM: imx3x: clean up ARCH_MX3X 2011-03-07 19:29:43 +01:00
include/mach Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-03-17 19:08:06 -07:00
3ds_debugboard.c ARM: plat-mxc: irq_data conversion. 2011-01-13 17:19:09 +01:00
Kconfig ARM: mxc91231: select MXC_AVIC 2011-03-07 19:29:44 +01:00
Makefile ARM i.MX ehci: do ehci init in board specific functions 2011-02-11 08:40:45 +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: mxc: free dma_mask in error path 2011-03-01 14:19:56 +01:00
epit.c ARM: mxc: update clock source registration 2010-12-22 22:44:39 +00:00
gpio.c ARM i.MX: Move gpio initialization to SoC specific files 2011-03-07 19:29:37 +01:00
iomux-v1.c ARM i.MX: iomux v1 initialization away from initcall 2011-03-07 19:29:38 +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 ARM i.MX: introduce imx_otg_ulpi_create to create ULPI transceivers 2011-03-07 19:29:41 +01:00