David Woodhouse 67577927e8 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git ...

Conflicts:
	drivers/mtd/mtd_blkdevs.c

Merge Grant's device-tree bits so that we can apply the subsequent fixes.

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

2010-10-30 12:35:11 +01:00

..

include/mach

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

2010-10-30 12:35:11 +01: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

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

ARM: 5667/3: U300 SSP/SPI board setup and test

2009-08-15 15:36:29 +01:00

Makefile

ARM: 5724/1: U300 AB3100 boardinfo v5

2009-10-19 17:10:09 +01:00

Makefile.boot

[ARM] 5535/1: U300 Makefile.boot

2009-06-04 17:47:36 +01:00

mmc.c

ARM: 6306/1: fix inverted MMC card detect in U300

2010-08-10 22:10:54 +01:00

mmc.h

[ARM] 5473/1: U300 core machine support

2009-04-28 22:44:15 +01:00

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

spi/pl022: Add spi->mode support to AMBA SPI driver

2010-10-12 21:37:37 -06:00

spi.h

ARM: 5667/3: U300 SSP/SPI board setup and test

2009-08-15 15:36:29 +01:00

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