Merge branch 'pm-upstream/pm-cpuidle' 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:21:24 -08:00
commit 8171d88089
4 changed files with 329 additions and 50 deletions