diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-24 12:29:58 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-24 12:29:58 +0100 |
| commit | 511f1cb6d426938fabf9c6d69ce4861b66ffd919 (patch) | |
| tree | 88fd9b5c15ccb42d5d582f83e87ce5d3f16127cb /drivers/rtc/rtc-sa1100.c | |
| parent | Merge branch 'next/fixes-non-critical' into next/drivers (diff) | |
| parent | Merge tag 'topic/twl' into regulator-next (diff) | |
| download | linux-511f1cb6d426938fabf9c6d69ce4861b66ffd919.tar.xz linux-511f1cb6d426938fabf9c6d69ce4861b66ffd919.zip | |
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>
Diffstat (limited to 'drivers/rtc/rtc-sa1100.c')
0 files changed, 0 insertions, 0 deletions