]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'regmap/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Dec 2011 04:45:25 +0000 (15:45 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Dec 2011 04:45:25 +0000 (15:45 +1100)
commitf20d10cda555e94578ddd3987846766ec2b6b1d3
treedca832b8efcfed00c49fd65a17928cae9320bf2e
parent1022338f0b030b9522ec158bf372cc560a16f4be
parentf5a26f8915779cf548481d64c7ea1ed5529bdbfe
Merge remote-tracking branch 'regmap/for-next'

Conflicts:
drivers/base/regmap/regcache.c
drivers/base/regmap/regmap.c
drivers/gpio/Kconfig
drivers/mfd/Kconfig
drivers/mfd/Makefile