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

This commit is contained in:
Tony Lindgren 2012-04-03 11:31:38 -07:00
commit 08956f1c58
4 changed files with 31 additions and 23 deletions