]> 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, 30 Sep 2011 03:34:11 +0000 (13:34 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 Sep 2011 03:34:11 +0000 (13:34 +1000)
commitbbead13f7030892b8e5f16f022fee3067b0c73c3
treec5a32ec8995fc7c05c9422b109309dad051c6cb5
parent1130aa630ae906e229861f8cec908b3cd074b140
parent4d2dc09538561eb8823c3c0072e6f5b868a5abe1
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