]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'regmap/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 13 Oct 2011 05:00:18 +0000 (16:00 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 13 Oct 2011 05:00:18 +0000 (16:00 +1100)
commit9ea1c186931699adf91350c00276955b7f84c562
tree45dc4f5beb38ed7db7a1b5805dcbe9b92c61a308
parentab8efd1119cd73512864398ffc9b59e4e19dd6b6
parent8528bdd450d34687b380c0f87992d105bdf54ca3
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