]> 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, 23 Sep 2011 04:26:54 +0000 (14:26 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 23 Sep 2011 04:26:54 +0000 (14:26 +1000)
commita4bcabaae2e15e29987ac6d423b83b1b4ef5a93a
treeede617d1e01f69099b421e866e72a92b991e6002
parent0830c80a5e34516da274be7113ae860b864d76cd
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