| commit | ece585df6ee6cbf7103b5e51485ad58d85fd84f2 | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Wed Jun 26 16:52:01 2013 +0200 |
| committer | Arnd Bergmann <arnd@arndb.de> | Wed Jun 26 16:52:01 2013 +0200 |
| tree | b186aad19c55f26315dc7c3deb41a8272703a2ed | |
| parent | 8ecb6ca61ac673f3712f82259de5b0a25d21d532 [diff] | |
| parent | 2ac524f151dbecb862c95b8f433267772caa800e [diff] |
Merge tag 'omap-pm-v3.11/fixes/omap5-voltdm' of git://git.kernel.org/pub/scm/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 <arnd@arndb.de>