Merge branch 'linus' into release

This commit is contained in:
Len Brown
2009-01-09 03:39:43 -05:00
7966 changed files with 919262 additions and 223615 deletions

View File

@@ -125,7 +125,7 @@ acpi_rs_create_resource_list(union acpi_operand_object *aml_buffer,
*
* FUNCTION: acpi_rs_create_pci_routing_table
*
* PARAMETERS: package_object - Pointer to an union acpi_operand_object
* PARAMETERS: package_object - Pointer to a union acpi_operand_object
* package
* output_buffer - Pointer to the user's buffer
*