From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 30 May 2011 02:27:49 +0000 (+1000)
Subject: Merge remote-tracking branch 'voltage/for-next'
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e8ec75d4f1d95545139882b3fcb8614dec03223c;p=pandora-kernel.git

Merge remote-tracking branch 'voltage/for-next'

Conflicts:
	drivers/mfd/Kconfig
	drivers/mfd/Makefile
	drivers/regulator/Makefile
---

e8ec75d4f1d95545139882b3fcb8614dec03223c
Reading git-diff-tree failed