From: Mark Brown Date: Sat, 12 May 2012 10:10:25 +0000 (+0100) Subject: Merge remote-tracking branch 'regulator/topic/drivers' into regulator-next X-Git-Tag: v3.5-rc1~177^2~57 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5949a7e9ab2db04edaeee7c368eb4c99131f4629;p=pandora-kernel.git Merge remote-tracking branch 'regulator/topic/drivers' into regulator-next Conflicts: drivers/regulator/88pm8607.c (simple overlap with a bugfix in v3.4) --- 5949a7e9ab2db04edaeee7c368eb4c99131f4629 Reading git-diff-tree failed