Skip to main content

Browse the archive

Revision 511f1cb6d426938fabf9c6d69ce4861b66ffd919 authored by Arnd Bergmann on 24 March 2012, 11:29:58 UTC, committed by Arnd Bergmann on 24 March 2012, 11:29:58 UTC 
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>
2 parent s f907ab0 + 4992fa1
History
File Mode Size
kvm
back to top