Russell King 7b9dd47136 Merge branch 'restart' into for-linus ...

Conflicts:
	arch/arm/mach-exynos/cpu.c

The changes to arch/arm/mach-exynos/cpu.c were moved to
mach-exynos/common.c.

2012-01-05 13:25:27 +00:00

..

include/mach

Merge branch 'restart' into for-linus

2012-01-05 13:25:27 +00: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

ARM: restart: lpc32xx & u300: remove unnecessary printk

2012-01-05 12:57:21 +00:00

dummyspichip.c

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

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

i2c.c

mfd: Delete ab3550 driver

2011-10-24 14:09:16 +02:00

i2c.h

ARM: 5668/2: U300 I2C board setup

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

Kconfig

Merge branch 'next/cleanup' of git://git.linaro.org/people/arnd/arm-soc

2011-11-01 20:11:00 -07:00

Makefile

pinctrl: add a driver for the U300 pinmux

2011-10-13 12:57:45 +02:00

Makefile.boot

Merge branch 'next/cleanup' of git://git.linaro.org/people/arnd/arm-soc

2011-11-01 20:11:00 -07:00

mmc.c

Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm

2011-10-27 08:39:10 +02:00

mmc.h

…

regulator.c

ARM: 5724/1: U300 AB3100 boardinfo v5

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

spi.c

pinctrl: add a driver for the U300 pinmux

2011-10-13 12:57:45 +02:00

spi.h

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

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

timer.c

ARM: 7205/2: sched_clock: allow sched_clock to be selected at runtime

2011-12-18 23:00:26 +00:00

u300.c

Merge branch 'restart' into for-linus

2012-01-05 13:25:27 +00:00