Merge branch 'for_2.6.38/pm-fixes' of ssh://master.kernel.org/pub/scm/linux/kernel...
authorTony Lindgren <tony@atomide.com>
Thu, 3 Mar 2011 18:25:18 +0000 (10:25 -0800)
committerTony Lindgren <tony@atomide.com>
Thu, 3 Mar 2011 18:25:18 +0000 (10:25 -0800)
commit077f8ec889bb1eb26a7128fdbc75922755ed2320
tree196fe4b28dbda6f1036902c50a109fecb990cd76
parent525a11381bcad9a7f55d0bac9c8676fe71819002
parentb3329a33b5a3902e65c5517f41c374f5adb060e1
Merge branch 'for_2.6.38/pm-fixes' of ssh:///linux/kernel/git/khilman/linux-omap-pm into devel-fixes