2.6.33-rc1+ bisected (?) s2ram regression

["Carlos R. Mafra" <crmafra@aei.mpg.de>]

After 2.6.33-rc1 suspend to RAM (echo mem > /sys/power/state) stopped working
on my Vaio. Plain 2.6.33-rc1 is fine.

The symptom is that it seems to never finish suspending, and the last 
messages on the console stay there forever and the laptop stays dead
(no leds blinking, can't hear the fan, no nothing). I have to press 
the power button to use it again.

I bisected it down to e2912009fb7b7157 ("sched: Ensure set_task_cpu() is 
never called on blocked tasks"), but it does not revert cleanly for me
to double check it.

[ I tried to "solve"  the merge conflict and the kernel compiled, but 
  s2ram did not work after that. So I am not sure if my bisection culprit 
  makes sense. ]
  
This is the bisect log:

# good: [55639353a0035052d9ea6cfe4dde0ac7fcbb2c9f] Linux 2.6.33-rc1
git bisect good 55639353a0035052d9ea6cfe4dde0ac7fcbb2c9f
# bad: [dd59f6c76b265ed2ff18b497d6105a9511b1feb1] Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6
git bisect bad dd59f6c76b265ed2ff18b497d6105a9511b1feb1
# bad: [aac3d39693529ca538e37ebdb6ed5d6432a697c7] Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
git bisect bad aac3d39693529ca538e37ebdb6ed5d6432a697c7
# bad: [077614ee1e93245a3b9a4e1213659405dbeb0ba6] sched: Fix broken assertion
git bisect bad 077614ee1e93245a3b9a4e1213659405dbeb0ba6
# bad: [e2912009fb7b715728311b0d8fe327a1432b3f79] sched: Ensure set_task_cpu() is never called on blocked tasks
git bisect bad e2912009fb7b715728311b0d8fe327a1432b3f79
# good: [b9f8fcd55bbdb037e5332dbdb7b494f0b70861ac] sched: Fix cpu_clock() in NMIs, on !CONFIG_HAVE_UNSTABLE_SCHED_CLOCK
git bisect good b9f8fcd55bbdb037e5332dbdb7b494f0b70861ac
# good: [9ee349ad6d326df3633d43f54202427295999c47] sched: Fix set_cpu_active() in cpu_down()
git bisect good 9ee349ad6d326df3633d43f54202427295999c47
# good: [e4f4288842ee12747e10c354d72be7d424c0b627] sched: Select_task_rq_fair() must honour SD_LOAD_BALANCE
git bisect good e4f4288842ee12747e10c354d72be7d424c0b627
# good: [06b83b5fbea273672822b6ee93e16781046553ec] sched: Use TASK_WAKING for fork wakups
git bisect good 06b83b5fbea273672822b6ee93e16781046553ec
  

If there is anything else I can do, let me know.