Merge branch 'for_3.6/pm/sr-move' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorTony Lindgren <tony@atomide.com>
Tue, 26 Jun 2012 13:55:23 +0000 (06:55 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 26 Jun 2012 13:55:23 +0000 (06:55 -0700)

Trivial merge