Arnd Bergmann 3e965b1763 Merge branch 'next/fixes' into next/cleanup ... Conflicts: arch/arm/mach-mxs/include/mach/gpio.h arch/arm/plat-mxc/include/mach/gpio.h drivers/video/omap/lcd_apollon.c drivers/video/omap/lcd_ldp.c drivers/video/omap/lcd_overo.c		2011-10-31 23:25:41 +01:00
..
include/mach	Merge branch 'next/fixes' into next/cleanup	2011-10-31 23:25:41 +01:00
clock.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
clock.h	ARM: 6949/2: mach-u300: fix compilaton warning in IO accessors	2011-06-09 10:15:06 +01:00
core.c	Merge branch 'next/fixes' into next/cleanup	2011-10-31 23:25:41 +01:00
dummyspichip.c	spi/pl022: Add spi->mode support to AMBA SPI driver	2010-10-12 21:37:37 -06: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	Merge branch 'next/fixes' into next/cleanup	2011-10-31 23:25:41 +01:00
Makefile	gpio: move U300 GPIO driver to drivers/gpio	2011-05-26 17:29:33 -06:00
Makefile.boot	mach-u300: retire odd singlemem variant	2011-08-17 10:20:29 +02:00
mmc.c	ARM: 7033/1: mach-u300: break out GPIO driver specifics	2011-08-22 09:12:53 +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: set apropriate FIFO trigger levels	2011-06-23 12:09:43 +02:00
spi.h	ARM: 5667/3: U300 SSP/SPI board setup and test	2009-08-15 15:36:29 +01:00
timer.c	mach-u300: cleanup clockevent code	2011-06-23 12:09:42 +02:00
u300.c	Merge branch 'depends/rmk/devel-stable' into next/cleanup	2011-10-08 21:07:42 +02:00