Merge tag 'for_3.7-rc5-fixes-pm' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorTony Lindgren <tony@atomide.com>
Tue, 6 Nov 2012 17:53:42 +0000 (09:53 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 6 Nov 2012 17:53:42 +0000 (09:53 -0800)

Trivial merge