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

This commit is contained in:
Tony Lindgren 2010-05-20 11:11:44 -07:00
commit 5a5f561e40
5 changed files with 41 additions and 28 deletions