tree bb79c15d5da41113bd7b83d9e74fbfc4a1bf8569
parent 6971071cdda79cad5f53ba390e466d696e7e9006
parent bb1c9034b3ce7f29d3d178a87b42b767611d6574
author Tony Lindgren <tony@atomide.com> 1292979180 -0800
committer Tony Lindgren <tony@atomide.com> 1292979180 -0800

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