Merge branch 'for_3.6/pm/performance' of git://git.kernel.org/pub/scm/linux/kernel...
authorTony Lindgren <tony@atomide.com>
Wed, 27 Jun 2012 11:50:21 +0000 (04:50 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 27 Jun 2012 11:50:21 +0000 (04:50 -0700)

Trivial merge