| commit | 08956f1c5883f66c2e547f8137061c6b58ccbb53 | [log] [tgz] |
|---|---|---|
| author | Tony Lindgren <tony@atomide.com> | Tue Apr 03 11:31:38 2012 -0700 |
| committer | Tony Lindgren <tony@atomide.com> | Tue Apr 03 11:31:38 2012 -0700 |
| tree | 3112bdeac2bf85b7c3dafacbb42b687d09fbc5f2 | |
| parent | 3916043576ecefe01818684b38c73695322fd29f [diff] | |
| parent | 4ba7c3c3c6567210bf46b1ab3d089134170c2762 [diff] |
Merge branch 'for_3.4/fixes/pm' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into fixes