Merge remote-tracking branch 'regmap/for-next'
commit83c2096b85ef67a7254821813758f6cd635e7ff8
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 23 Aug 2011 04:33:31 +0000 (23 14:33 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 23 Aug 2011 04:33:31 +0000 (23 14:33 +1000)
tree43cb7179bf3c50913516be5f87a4981b98ec9723
parente29f04caae45aa584e963a6a9106349440a63848
parentfec4fe26ec69cc63f56e649759b3c8bcc98016ea
Merge remote-tracking branch 'regmap/for-next'
drivers/base/regmap/regmap-spi.c
drivers/mfd/Kconfig
drivers/mfd/wm8994-core.c
include/linux/mfd/wm8994/core.h