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

This commit is contained in:
Tony Lindgren 2010-01-20 18:20:47 -08:00
commit ccaae273c3
9 changed files with 95 additions and 45 deletions