tree d668104b1021bcc737b5fadc7992f45a4c638705
parent b955eefc46a6923424cbede2f8ab76c8f5acf056
parent 21ff63ad131218048525fbd37d065ce61f03bcbd
author Tony Lindgren <tony@atomide.com> 1340718923 -0700
committer Tony Lindgren <tony@atomide.com> 1340718923 -0700

Merge branch 'for_3.6/pm/sr-move' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into devel-driver