| commit | 0fdc54b2019700a4b50179914e810367c14044a3 | [log] [tgz] |
|---|---|---|
| author | Tony Lindgren <tony@atomide.com> | Tue Feb 23 19:22:48 2010 -0800 |
| committer | Tony Lindgren <tony@atomide.com> | Tue Feb 23 19:22:48 2010 -0800 |
| tree | 73e5e34f30aec87ad4bf4423c4f95ebba576359e | |
| parent | 8250a5c381cc6714a061a39cfd29d7453e8ad64b [diff] | |
| parent | 79dcfdd407208cba06bd446e93b0809df1cf10d1 [diff] |
Merge branch 'pm-2.6.34' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus