Merge branch 'for_3.1/pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into fixes

This commit is contained in:
Tony Lindgren 2011-08-10 03:36:42 -07:00
commit 58cf5e7fd5
4 changed files with 13 additions and 15 deletions