Simply changing the resume option in Grub has not completely solved this problem: with the new kernel, my computer still can't resume from suspend in certain situations. I'm not sure how related that problem is so I've raised it as a new issue: Bug 1215927