Merge branch 'pm-upstream/debug' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into for-next

This commit is contained in:
Tony Lindgren 2009-09-02 15:23:05 -07:00
commit 5567fa1f54
9 changed files with 607 additions and 15 deletions