Merge branch 'for_3.6/pm/performance' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into devel-pm

This commit is contained in:
Tony Lindgren 2012-06-27 04:50:21 -07:00
commit 4556494b06
5 changed files with 57 additions and 59 deletions