Merge remote-tracking branch 'regmap/topic/introspection' into regmap-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 14 Mar 2012 13:15:03 +0000 (13:15 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 14 Mar 2012 13:15:03 +0000 (13:15 +0000)
commiteae4b51b21f7452b0b53a9848f48c02cb0fac336
tree20d54023bf32e061866c83565d44d694e2598ba5
parent4a6be7bb7474500a69f6d8f25899b8038491bdbb
parenta6539c32949063c8147905512a83a98842c2d254
Merge remote-tracking branch 'regmap/topic/introspection' into regmap-next

Simple add/add conflict:
drivers/base/regmap/regmap.c
drivers/base/regmap/regmap.c
include/linux/regmap.h