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

..

bindings

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

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

00-INDEX

Documentation: add devicetree docs index file

2011-03-16 10:47:03 -07:00

booting-without-of.txt

dt: add documentation of ARM dt boot interface

2011-05-23 09:30:20 -06:00