Merge branches 'release' and 'hwmon-conflicts' into release

This commit is contained in:
Len Brown 2008-02-07 03:31:17 -05:00
commit 299cfe3808
4 changed files with 204 additions and 5 deletions

View file

@ -242,8 +242,8 @@ acpi_status acpi_os_validate_interface(char *interface);
acpi_status acpi_osi_invalidate(char* interface);
acpi_status
acpi_os_validate_address(u8 space_id,
acpi_physical_address address, acpi_size length);
acpi_os_validate_address(u8 space_id, acpi_physical_address address,
acpi_size length, char *name);
u64 acpi_os_get_timer(void);