]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'regmap/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 12 Oct 2011 05:06:39 +0000 (16:06 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 12 Oct 2011 05:06:39 +0000 (16:06 +1100)
commitbe758b1b131403ac94979288b6985487ab57abc3
treeb96f9bf9cb132962ad7bcf310a858fc6656c6211
parent44ee5ea76ebe908e231248e9e326785ba42cfc6e
parent8528bdd450d34687b380c0f87992d105bdf54ca3
Merge remote-tracking branch 'regmap/for-next'

Conflicts:
drivers/mfd/wm831x-spi.c
drivers/base/regmap/regmap-spi.c
drivers/mfd/Kconfig
drivers/mfd/wm8994-core.c
include/linux/mfd/wm831x/core.h
include/linux/mfd/wm8994/core.h