From: Arnd Bergmann <arnd@arndb.de>
Date: Sat, 24 Mar 2012 11:29:58 +0000 (+0000)
Subject: Merge tag 'regulator-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Tag: v3.4-rc1~86^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=511f1cb6d426938fabf9c6d69ce4861b66ffd919;p=pandora-kernel.git

Merge tag 'regulator-3.4' of git://git./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>
---

511f1cb6d426938fabf9c6d69ce4861b66ffd919
Reading git-diff-tree failed