linux/arch/arm/mach-u300
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
..
include/mach Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-03-17 19:08:06 -07:00
clock.c ARM: 6483/1: arm & sh: factorised duplicated clkdev.c 2010-11-26 10:51:04 +00:00
clock.h ARM: 6296/1: clock U300 intcon and timer properly 2010-08-10 22:10:55 +01:00
core.c mach-u300: config U300 PL180 PL011 PL022 for DMA 2011-03-14 14:05:13 +01:00
dummyspichip.c spi/pl022: Add spi->mode support to AMBA SPI driver 2010-10-12 21:37:37 -06:00
gpio.c fix typos concerning "initiali[zs]e" 2010-06-16 18:05:05 +02:00
i2c.c ARM: AB3550 board configuration and irq for U300 2010-05-28 01:37:47 +02:00
i2c.h ARM: 5668/2: U300 I2C board setup 2009-08-15 15:36:29 +01:00
Kconfig tree-wide: fix comment/printk typos 2010-11-01 15:38:34 -04:00
Makefile ARM: 5724/1: U300 AB3100 boardinfo v5 2009-10-19 17:10:09 +01:00
Makefile.boot
mmc.c mach-u300: config U300 PL180 PL011 PL022 for DMA 2011-03-14 14:05:13 +01:00
mmc.h
padmux.c ARM: 5666/1: Revamped U300 padmux API 2009-08-15 15:36:28 +01:00
padmux.h ARM: 5666/1: Revamped U300 padmux API 2009-08-15 15:36:28 +01:00
regulator.c ARM: 5724/1: U300 AB3100 boardinfo v5 2009-10-19 17:10:09 +01:00
spi.c mach-u300: config U300 PL180 PL011 PL022 for DMA 2011-03-14 14:05:13 +01:00
spi.h ARM: 5667/3: U300 SSP/SPI board setup and test 2009-08-15 15:36:29 +01:00
timer.c ARM: u300: convert sched_clock() to use new infrastructure 2010-12-22 22:44:47 +00:00
u300.c ARM: P2V: separate PHYS_OFFSET from platform definitions 2011-02-17 23:26:55 +00:00