]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'regmap/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 7 Oct 2011 04:50:08 +0000 (15:50 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 7 Oct 2011 04:50:08 +0000 (15:50 +1100)
commit39365cbcb1ad60bc354b050d4a6b1fdae2511287
tree1ced412c6e14eb887591b0460d6d41aca006ee5b
parentf8a44f6bbdd2deef297811ff9d0865d425f86e8f
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