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

This commit is contained in:
Tony Lindgren 2012-06-28 00:08:58 -07:00
commit 4348be7a58
7 changed files with 33 additions and 27 deletions