Merge to-linus-stable into to-akpm
authorLen Brown <len.brown@intel.com>
Mon, 15 Aug 2005 19:52:00 +0000 (15:52 -0400)
committerLen Brown <len.brown@intel.com>
Mon, 15 Aug 2005 19:52:00 +0000 (15:52 -0400)
commitf6869979bec3cc2efddc7359f30ba37642084fb7
tree827629b75e165a7726297955c2916aa75712c66e
parent50526df605e7c3e22168664acf726269eae10171
parent30e332f3307e9f7718490a706e5ce99f0d3a7b26
Merge to-linus-stable into to-akpm
Documentation/acpi-hotkey.txt
drivers/acpi/osl.c