Merge branch 'for_3.6/cleanup/pm' of git://git.kernel.org/pub/scm/linux/kernel/git...