From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Sun, 22 Jul 2012 18:26:07 +0000 (+0100)
Subject: Merge branches 'regmap-core', 'regmap-irq' and 'regmap-page' into regmap-next
X-Git-Tag: v3.6-rc1~158^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38e23194e1c95e73819d25a63bcf94fe4709d4c5;p=pandora-kernel.git

Merge branches 'regmap-core', 'regmap-irq' and 'regmap-page' into regmap-next

Conflicts (trivial context stuff):
	drivers/base/regmap/regmap.c
	include/linux/regmap.h
---

38e23194e1c95e73819d25a63bcf94fe4709d4c5
Reading git-diff-tree failed