From: Arnd Bergmann Date: Wed, 26 Jun 2013 14:52:01 +0000 (+0200) Subject: Merge tag 'omap-pm-v3.11/fixes/omap5-voltdm' of git://git.kernel.org/pub/scm/linux... X-Git-Tag: firefly_0821_release~176^2~5840^2~6 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=ece585df6ee6cbf7103b5e51485ad58d85fd84f2;p=firefly-linux-kernel-4.4.55.git Merge tag 'omap-pm-v3.11/fixes/omap5-voltdm' of git://git./linux/kernel/git/khilman/linux-omap-pm into next/soc From Kevin Hilman: OMAP5: PM: fix boot by removing unneeded dummy voltage domain data * tag 'omap-pm-v3.11/fixes/omap5-voltdm' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm: ARM: OMAP5: voltagedomain data: remove temporary OMAP4 voltage data Signed-off-by: Arnd Bergmann --- ece585df6ee6cbf7103b5e51485ad58d85fd84f2