After a lot of bisecting I've found the bad commit:
9b12e18cdc1553de62d931e73443c806347cd974 is first bad commit
commit 9b12e18cdc1553de62d931e73443c806347cd974
Author: venkatesh.pallipadi@intel.com <venkatesh.pallipadi@intel.com>
Date: Thu Jan 31 17:35:05 2008 -0800
ACPI: cpuidle: Support C1 idle time accounting
Show C1 idle time in /sysfs cpuidle interface. C1 idle time may not
be entirely accurate in all cases. It includes the time spent
in the interrupt handler after wakeup with "hlt" based C1. But, it will
be accurate with "mwait" based C1.
Reverting the commit brings my laptop back to C2.
HTH
- Jan
--