Merge branch 'for_2.6.39/pm-integration' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus

This commit is contained in:
Tony Lindgren 2011-03-11 09:39:58 -08:00
commit 0d9596958d
5 changed files with 84 additions and 44 deletions