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

This commit is contained in:
Tony Lindgren 2011-01-31 13:20:26 -08:00
commit 112258b1d2
3 changed files with 10 additions and 9 deletions