linux/arch/arm/mach-mxs
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: mxs: add dma device 2011-03-07 19:29:53 +01:00
include/mach ARM: mxs: make ssp error irq definition consistent 2011-03-07 19:29:54 +01:00
Kconfig ARM: mxs/mx28evk: add framebuffer device 2011-03-10 11:18:35 +01:00
Makefile ARM: mxs: Initial support for Ka-Ro TX28 2011-03-07 19:29:07 +01:00
Makefile.boot ARM: mxs: Add build configuration for mxs 2010-12-20 17:30:44 +01:00
clock-mx23.c ARM: mxs: add dma device 2011-03-07 19:29:53 +01:00
clock-mx28.c ARM: mx28: set proper parent for lcdif clock 2011-03-10 11:17:29 +01:00
clock.c ARM i.MX23/28: remove secondary field from struct clk. It's unused 2011-01-24 09:01:48 +01:00
devices-mx23.h ARM i.MX23/28: Add framebuffer device support 2011-03-07 19:29:31 +01:00
devices-mx28.h ARM i.MX23/28: Add framebuffer device support 2011-03-07 19:29:31 +01:00
devices.c ARM: mxs: free dma_mask in error path 2011-03-01 14:19:55 +01:00
gpio.c Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-03-17 19:08:06 -07:00
gpio.h ARM: mxs: Add gpio support 2010-12-20 17:29:51 +01:00
icoll.c ARM: 6744/1: mxs: irq_data conversion 2011-02-23 16:22:18 +00:00
iomux.c ARM: mxs: Add iomux support 2010-12-20 17:29:58 +01:00
mach-mx23evk.c ARM: mxs/mx23evk: add framebuffer device 2011-03-07 19:29:49 +01:00
mach-mx28evk.c ARM: mxs/mx28evk: add framebuffer device 2011-03-10 11:18:35 +01:00
mach-tx28.c arm: mxs: tx28: add i2c bus and connected RTC 2011-03-07 19:29:18 +01:00
mm-mx23.c ARM: mxs: Add static memory mapping 2010-12-20 17:30:23 +01:00
mm-mx28.c ARM: mxs: Add static memory mapping 2010-12-20 17:30:23 +01:00
module-tx28.c ARM: mxs: Initial support for Ka-Ro TX28 2011-03-07 19:29:07 +01:00
module-tx28.h ARM: mxs: Initial support for Ka-Ro TX28 2011-03-07 19:29:07 +01:00
ocotp.c ARM: mxs: add ocotp read function 2011-01-21 11:36:49 +01:00
pm.c ARM: mxs: add initial pm support 2011-01-26 08:30:49 +01:00
regs-clkctrl-mx23.h ARM i.MX23: remove reserved register defines 2011-01-28 08:28:52 +01:00
regs-clkctrl-mx28.h ARM i.MX28: remove reserved register defines 2011-01-28 08:28:57 +01:00
system.c ARM: mxs: Add missing EXPORT_SYMBOL for mxs_reset_block 2011-03-07 19:29:06 +01:00
timer.c ARM: mxs: Add timer support 2010-12-20 17:29:50 +01:00