Merge branch 'pm-upstream/pm-off' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into 7xx-iosplit-plat-merge

This commit is contained in:
Tony Lindgren 2009-11-11 15:20:53 -08:00
commit 4d0226042c
24 changed files with 1809 additions and 50 deletions