summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-03-24 12:29:58 +0100
committerArnd Bergmann <arnd@arndb.de>2012-03-24 12:29:58 +0100
commit511f1cb6d426938fabf9c6d69ce4861b66ffd919 (patch)
tree88fd9b5c15ccb42d5d582f83e87ce5d3f16127cb /sound
parentMerge branch 'next/fixes-non-critical' into next/drivers (diff)
parentMerge tag 'topic/twl' into regulator-next (diff)
downloadlinux-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 'sound')
0 files changed, 0 insertions, 0 deletions