Merge remote-tracking branch 'regmap/topic/drivers' into regmap-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 14 Mar 2012 13:13:25 +0000 (13:13 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 14 Mar 2012 13:13:25 +0000 (13:13 +0000)
commit7d9aca39dcacd2b3f42e2e287162329f410f93e1
tree2907b680b2b7625226f46d23d74ccc9c58ad0362
parente1c1c69c8fc7656c33460c8e085ac0d0be22ac3b
parenta0cc0209abb9fe2b9ab71aa41be70eddd0cbdd61
Merge remote-tracking branch 'regmap/topic/drivers' into regmap-next

Resolved simple add/add conflicts:
drivers/base/regmap/internal.h
drivers/base/regmap/regmap.c
drivers/base/regmap/internal.h
drivers/base/regmap/regcache.c
drivers/base/regmap/regmap.c
include/linux/regmap.h