]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'regmap/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 Oct 2011 04:31:45 +0000 (15:31 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 Oct 2011 04:31:45 +0000 (15:31 +1100)
commit291917f6f316cb710820f126660dc09caba513e8
tree35bb195dae27893019966c6d777cb9c2373d23a8
parentc42efd67dd841be95e364c2bd61b51da94301131
parenteb8c7884450b6ac711a7528249cb85de078ba6ca
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