]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge commit 'refs/next/20110928/regmap'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 29 Sep 2011 05:15:30 +0000 (15:15 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 29 Sep 2011 05:15:30 +0000 (15:15 +1000)
commitfeb9ae872dbadd2ac1dd1c84a406663556f3ba39
treeae21e91cae6b9d38a95f223c56193be303dd6ea9
parent9f3e917366d306c284494cacf1cd1e47608ab7cd
parentdfdc4448e078d06bdba0da52db7176437877788f
Merge commit 'refs/next/20110928/regmap'

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