]> 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, 27 Sep 2011 05:45:52 +0000 (15:45 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 27 Sep 2011 05:45:52 +0000 (15:45 +1000)
commitec4ac0eb8288280fd4881f3779d8dce883aa7eee
tree70a614484a62cccf735edb010d1531bafb6d1255
parent029d5434a2c612513f69f848fa9cbdc4a9846e29
parent523d9cfbb2094e095ff08a01c4eac10cc7d287c3
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