]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'regmap/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 4 Oct 2011 05:28:37 +0000 (16:28 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 4 Oct 2011 05:28:37 +0000 (16:28 +1100)
commit2ad1560ac90fc3c25ac8f878ecc6d99f15bc06b2
treec4217a6154d79ca5522da6c6bb4eb659723e5fa3
parent5f6e0749cdd8c534544062d1526a1b016e3ca971
parent0eef6b0415f58ed16aff95af8c92514ce5c01258
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