commit | 5a5f561e4060844a37d8fe81dce2352c406aac97 | [log] [tgz] |
---|---|---|
author | Tony Lindgren <tony@atomide.com> | Thu May 20 11:11:44 2010 -0700 |
committer | Tony Lindgren <tony@atomide.com> | Thu May 20 11:11:44 2010 -0700 |
tree | 8374fb43035ac6f93cf3e15f054e3a4e6acbf078 | |
parent | 935d918046d4c29f053d56fff67d6a21495fd780 [diff] | |
parent | 331b9e3d61cba2ad089f3f1fe2ef0122679337a1 [diff] |
Merge branch 'pm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus