Merge branch 'pm-2.6.34' 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-02-23 19:22:48 -08:00
commit 0fdc54b201
7 changed files with 352 additions and 38 deletions