commit | 94a06b74e724caabcf0464c81527cfbcae0c8aff | [log] [tgz] |
---|---|---|
author | Tony Lindgren <tony@atomide.com> | Thu Mar 10 18:54:14 2011 -0800 |
committer | Tony Lindgren <tony@atomide.com> | Thu Mar 10 18:54:14 2011 -0800 |
tree | 3570b6a627382a5eb5c8328b4959f615544d8e62 | |
parent | 0dde52a9f5330eec240660191a94b51bd911ffcd [diff] | |
parent | 9062511097683b4422f023d181b4a8b2db1a7a72 [diff] |
Merge branch 'for_2.6.39/pm-misc' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus