Arnd Bergmann 511f1cb6d4 Merge tag 'regulator-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into next/drivers ...

The pxa regulator branch removes the bq24022 driver, while a lot of
other regulator drivers got added in the regulator tree. This
resolves the trivial conflicts by merging in the regulator patches
that are already merged into v3.4.

Conflicts:
	drivers/regulator/Kconfig
	drivers/regulator/Makefile

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

2012-03-24 11:29:58 +00:00

..

include/mach

ARM: big removal of now unused arch_idle()

2012-01-20 19:25:58 -05: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: amba: u300: use common amba device initializers

2012-01-26 19:59:29 +00:00

dummyspichip.c

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

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

i2c.c

ARM: U300: Don't specify regulator consumers by struct device

2012-02-17 13:42:49 -08:00

i2c.h

ARM: 5668/2: U300 I2C board setup

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

Kconfig

pinctrl: rename U300 and SIRF pin controllers

2012-01-03 09:10:08 +01: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

ARM: u300: localize GPIO assignments

2012-01-03 09:10:03 +01:00

mmc.h

[ARM] 5473/1: U300 core machine support

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

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-gpio.h

ARM: u300: localize GPIO assignments

2012-01-03 09:10:03 +01:00

u300.c

Merge branch 'depends/rmk/restart' into next/cleanup

2012-01-07 11:51:28 +00:00