From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed, 14 Mar 2012 13:15:03 +0000 (+0000)
Subject: Merge remote-tracking branch 'regmap/topic/introspection' into regmap-next
X-Git-Tag: v3.4-rc1~126^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eae4b51b21f7452b0b53a9848f48c02cb0fac336;p=pandora-kernel.git

Merge remote-tracking branch 'regmap/topic/introspection' into regmap-next

Simple add/add conflict:
	drivers/base/regmap/regmap.c
---

eae4b51b21f7452b0b53a9848f48c02cb0fac336
Reading git-diff-tree failed