Merge 'acpi-2.6.12' branch into to-akpm
authorLen Brown <len.brown@intel.com>
Mon, 15 Aug 2005 19:56:23 +0000 (15:56 -0400)
committerLen Brown <len.brown@intel.com>
Mon, 15 Aug 2005 19:56:23 +0000 (15:56 -0400)
commitcb220c1af49644786944c549518b491d4c654030
tree9e0f95049de550b0e5f59a5f62ad9089997b6815
parent1dadb3dadfaa01890fc10df03f0dd03a9f8774b2
parentf6869979bec3cc2efddc7359f30ba37642084fb7
Merge 'acpi-2.6.12' branch into to-akpm
Documentation/kernel-parameters.txt
drivers/acpi/osl.c