tree b55e5a587e2d0047fd645ba926db4fa784f2ea84
parent 82e865011accc9fd1e048961da7cefc4d08f3292
parent ee894b18e064447f86019af38a90ccb091880942
author Tony Lindgren <tony@atomide.com> 1254843148 -0700
committer Tony Lindgren <tony@atomide.com> 1254843148 -0700

Merge branch 'pm-fixes-32' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-fixes-for-linus