| commit | 511f1cb6d426938fabf9c6d69ce4861b66ffd919 | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Sat Mar 24 11:29:58 2012 +0000 |
| committer | Arnd Bergmann <arnd@arndb.de> | Sat Mar 24 11:29:58 2012 +0000 |
| tree | 88fd9b5c15ccb42d5d582f83e87ce5d3f16127cb | |
| parent | f907ab06bb021bcb91d39c8d1b36536ebdb318fa [diff] | |
| parent | 4992fa1fd425f1934f503ffa96b68e235b89db9a [diff] |
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>