Merge branch 'for_3.6/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-08-10 23:21:57 -07:00
commit cf835e8d22
5 changed files with 15 additions and 19 deletions