tree 196fe4b28dbda6f1036902c50a109fecb990cd76
parent 525a11381bcad9a7f55d0bac9c8676fe71819002
parent b3329a33b5a3902e65c5517f41c374f5adb060e1
author Tony Lindgren <tony@atomide.com> 1299176718 -0800
committer Tony Lindgren <tony@atomide.com> 1299176718 -0800

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