tree 8374fb43035ac6f93cf3e15f054e3a4e6acbf078
parent 935d918046d4c29f053d56fff67d6a21495fd780
parent 331b9e3d61cba2ad089f3f1fe2ef0122679337a1
author Tony Lindgren <tony@atomide.com> 1274379104 -0700
committer Tony Lindgren <tony@atomide.com> 1274379104 -0700

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