When a merge does not work automatically, git prevents
[linux-2.6] / drivers / acpi / processor_core.c
2005-07-12  Venkatesh Pallipadi[ACPI] enable C2 and C3 idle power states on SMP
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2