From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 15 Apr 2013 16:27:12 +0000 (+0100)
Subject: Merge tag 'v3.9-rc7' into regulator-fix-core
X-Git-Tag: omap-for-v3.10/dt-fixes-for-merge-window~131^2~27^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cd2d95d97c8d1b66467507400c63d707ddb1deba;p=pandora-kernel.git

Merge tag 'v3.9-rc7' into regulator-fix-core

Linux 3.9-rc7

Trivial context overlap conflicts:
	MAINTAINERS
---

cd2d95d97c8d1b66467507400c63d707ddb1deba
Reading git-diff-tree failed