]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'regmap/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 25 Oct 2011 07:45:45 +0000 (18:45 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 25 Oct 2011 07:45:45 +0000 (18:45 +1100)
commit1bb5a4fbed3bc0d7a7cedb9501e069924cb8c854
tree2428bbe0e83a2f67d8db6388078130746851289e
parentadada01a0d29618432aaa609d8c2b2900279901e
parenta08448146ddb8d766f9dc3dbaa01dd59e0387bd8
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