| commit | c8e0bf95fc01d6e2ca585fe08010800b6c56e823 | [log] [tgz] |
|---|---|---|
| author | Tony Lindgren <tony@atomide.com> | Mon Jun 13 07:40:25 2011 -0700 |
| committer | Tony Lindgren <tony@atomide.com> | Mon Jun 13 07:40:25 2011 -0700 |
| tree | f901bdcb5b20e93261cf9cf324ebbcf3fd24ce58 | |
| parent | 9d5ae7cd6cb9ead43336fec1094184d1dc740fbd [diff] | |
| parent | 345f79b3de7f6d651e4dba794af7c7303bdfd649 [diff] |
Merge branch 'for_3.0/pm-fixes' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into fixes