]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'regmap/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Sep 2011 04:17:24 +0000 (14:17 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Sep 2011 04:17:24 +0000 (14:17 +1000)
commit7a202f4b4a1b8f400802b9de2f148ea04da7a877
treee855375b4f20e070d693fd8a6776a09c0d0244a6
parentb076b94bfaef6b2fc4627781e267d7e594ad510c
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