When a merge does not work automatically, git prevents
[safe/jmp/linux-2.6] / Documentation / acpi-hotkey.txt
2005-07-29 Iacopo Spalletti[ACPI] update hotkey documentation
2005-07-12 Luming Yu[ACPI] generic Hot Key support