]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'regmap/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 26 Sep 2011 06:26:14 +0000 (16:26 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 26 Sep 2011 06:26:14 +0000 (16:26 +1000)
commit48e8654e186cfc18eb6b76d2fcfa043551224d9c
treeafc40851e24ce719a1ba3b0db33677d87d541aa2
parentf6ec96994fdc84bf2962eadc4c160e135a761930
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