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

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
---

7d9aca39dcacd2b3f42e2e287162329f410f93e1
Reading git-diff-tree failed