| commit | d120cfb544ed6161b9d32fb6c4648c471807ee6b | [log] [tgz] |
|---|---|---|
| author | Len Brown <len.brown@intel.com> | Thu Jun 29 19:57:46 2006 -0400 |
| committer | Len Brown <len.brown@intel.com> | Thu Jun 29 19:57:46 2006 -0400 |
| tree | 7757ad0198d8df76ff5c60f939a687687c41da00 | |
| parent | 9dce0e950dbfab4148f35ac6f297d8638cdc63c4 [diff] | |
| parent | bf7e8511088963078484132636839b59e25cf14f [diff] |
merge linus into release branch Conflicts: drivers/acpi/acpi_memhotplug.c