From Kevin Hilman <khilman@deeprootsystems.com>:

OMAP PM related fixes for v3.7-rc
Merge tag 'for_3.7-fixes-pm' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-v3.7-rc1/fixes-pm

OMAP PM related fixes for v3.7-rc