| commit | 58cf5e7fd5554735901dc855f5d4c16c59331dd5 | [log] [tgz] |
|---|---|---|
| author | Tony Lindgren <tony@atomide.com> | Wed Aug 10 03:36:42 2011 -0700 |
| committer | Tony Lindgren <tony@atomide.com> | Wed Aug 10 03:36:42 2011 -0700 |
| tree | 313ed295ec518b7bbc3d3ba952fc4fe430dc2ace | |
| parent | c9a48c2aac235f7a7e31fb7214a33afcd0da26b7 [diff] | |
| parent | 98333b3dda1e490b02304a6a6643c294d4e520c3 [diff] |
Merge branch 'for_3.1/pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into fixes