Jiri Kosina 4b7bd36470 Merge branch 'master' into for-next ... Conflicts: MAINTAINERS arch/arm/mach-omap2/pm24xx.c drivers/scsi/bfa/bfa_fcpim.c Needed to update to apply fixes for which the old branch was too outdated.		2010-12-22 18:57:02 +01:00
..
include/mach	tree-wide: fix comment/printk typos	2010-11-01 15:38:34 -04:00
clock.c	ARM: platform data to use the FSMC NAND with the U300	2010-10-25 00:35:46 +01:00
clock.h	ARM: 6296/1: clock U300 intcon and timer properly	2010-08-10 22:10:55 +01:00
core.c	ARM: platform data to use the FSMC NAND with the U300	2010-10-25 00:35:46 +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
i2c.h
Kconfig	tree-wide: fix comment/printk typos	2010-11-01 15:38:34 -04:00
Makefile
Makefile.boot
mmc.c	ARM: 6306/1: fix inverted MMC card detect in U300	2010-08-10 22:10:54 +01:00
mmc.h
padmux.c
padmux.h
regulator.c
spi.c	spi/pl022: fix erroneous platform data in U300	2010-11-01 01:01:08 -04:00
spi.h
timer.c	ARM: 6297/1: move U300 timer to dynamic clock lookup	2010-08-10 22:10:56 +01:00
u300.c	arm: remove machine_desc.io_pg_offst and .phys_io	2010-10-20 00:27:46 -04:00