]> 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, 14 Oct 2011 05:09:42 +0000 (16:09 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 14 Oct 2011 05:09:42 +0000 (16:09 +1100)
commitce127027426dfcd42983ef5833e5050fa39bc6b5
treecf02d137011d166ae628d1843367f03fa2798455
parente9b4ebb57f51fb464a7d33daff75e4efc2cf3a64
parentde2d808f4de091321978d05a85ef0819e8f3561a
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