| commit | 4564747649db987722aa781280eb8325c6a5a1a8 | [log] [tgz] |
|---|---|---|
| author | Tony Lindgren <tony@atomide.com> | Mon Jun 04 02:09:45 2012 -0700 |
| committer | Tony Lindgren <tony@atomide.com> | Mon Jun 04 02:09:45 2012 -0700 |
| tree | c75bd92f4c6a59e9873088f1e5357cd3242977cd | |
| parent | f8f5701bdaf9134b1f90e5044a82c66324d2073f [diff] | |
| parent | 1ce029968718477149e7f1fb245a8e82c690cc4a [diff] |
Merge branch 'for_3.5/fixes/pm' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into fixes