diff options
author | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
commit | d120cfb544ed6161b9d32fb6c4648c471807ee6b (patch) | |
tree | 7757ad0198d8df76ff5c60f939a687687c41da00 /drivers/acpi/namespace | |
parent | 9dce0e950dbfab4148f35ac6f297d8638cdc63c4 (diff) | |
parent | bf7e8511088963078484132636839b59e25cf14f (diff) | |
download | kernel_samsung_smdk4412-d120cfb544ed6161b9d32fb6c4648c471807ee6b.zip kernel_samsung_smdk4412-d120cfb544ed6161b9d32fb6c4648c471807ee6b.tar.gz kernel_samsung_smdk4412-d120cfb544ed6161b9d32fb6c4648c471807ee6b.tar.bz2 |
merge linus into release branch
Conflicts:
drivers/acpi/acpi_memhotplug.c
Diffstat (limited to 'drivers/acpi/namespace')
0 files changed, 0 insertions, 0 deletions