| commit | 077f8ec889bb1eb26a7128fdbc75922755ed2320 | [log] [tgz] |
|---|---|---|
| author | Tony Lindgren <tony@atomide.com> | Thu Mar 03 10:25:18 2011 -0800 |
| committer | Tony Lindgren <tony@atomide.com> | Thu Mar 03 10:25:18 2011 -0800 |
| tree | 196fe4b28dbda6f1036902c50a109fecb990cd76 | |
| parent | 525a11381bcad9a7f55d0bac9c8676fe71819002 [diff] | |
| parent | b3329a33b5a3902e65c5517f41c374f5adb060e1 [diff] |
Merge branch 'for_2.6.38/pm-fixes' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into devel-fixes