From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 2 Jul 2012 17:24:59 +0000 (+0100)
Subject: Merge tag 'v3.5-rc5' into regulator-drivers
X-Git-Tag: v3.6-rc1~157^2^2~56
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=744c62eb65a1c3bb2196ded1a1d2922cf6f2ce80;p=pandora-kernel.git

Merge tag 'v3.5-rc5' into regulator-drivers

Linux 3.5-rc5 collides with further development.

Conflicts:
	drivers/regulator/tps65023-regulator.c
---

744c62eb65a1c3bb2196ded1a1d2922cf6f2ce80
Reading git-diff-tree failed