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
..
2012-01-22 15:08:43 -05:00
2011-12-13 15:30:49 -05:00
2011-11-02 16:07:03 -07:00
2012-01-10 16:30:42 -08:00
2012-01-03 22:54:57 -05:00
2011-12-13 09:26:45 +00:00
2011-11-07 23:54:53 +01:00
2012-02-20 19:46:36 +11:00
2012-01-04 08:56:31 -06:00
2011-11-26 14:59:39 -05:00
2011-12-09 17:35:51 -08:00
2011-12-11 18:25:16 -05:00
2012-01-12 20:13:04 -08:00
2012-01-03 22:54:58 -05:00
2011-12-13 11:58:49 +01:00
2012-01-12 20:13:08 -08:00
2012-01-03 22:54:56 -05:00
2011-11-13 16:10:10 -05:00
2012-01-03 22:55:17 -05:00
2011-12-11 18:25:16 -05:00
2012-01-09 13:52:09 +01:00
2012-01-17 15:40:51 -08:00
2011-12-27 11:26:41 +02:00
2012-01-12 20:13:10 -08:00
2011-11-14 00:47:54 -05:00
2012-01-06 12:10:26 -08:00
2012-01-12 15:23:04 -08:00
2011-12-13 09:26:45 +00:00
2011-11-02 16:07:02 -07:00
2012-01-03 22:55:07 -05:00
2012-01-03 22:54:56 -05:00
2012-03-05 15:49:42 -08:00
2012-01-03 22:52:40 -05:00
2012-01-09 09:33:57 +09:00
2011-12-13 09:26:45 +00:00
2011-10-31 17:30:47 -07:00
2012-01-03 22:54:56 -05:00
2012-02-28 15:06:33 -05:00
2012-01-24 12:25:14 -08:00
2011-11-02 16:07:02 -07:00