e
parent 63371faf9198302c7ebd41e7fbe78eb6b57bba86
author Tony Lindgren <tony@atomide.com> 1330986335 -0800
committer Tony Lindgren <tony@atomide.com> 1330986335 -0800

Merge branch 'for_3.4/cleanup/sr' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into sr
û