| commit | edd84690d15e4cb144cc60b754d4eaf8fac0a711 | [log] [tgz] |
|---|---|---|
| author | Len Brown <len.brown@intel.com> | Sun Apr 05 01:45:50 2009 -0400 |
| committer | Len Brown <len.brown@intel.com> | Sun Apr 05 01:45:50 2009 -0400 |
| tree | 4fc645c52ad9eebcdf59a6ab32d534df121dd280 | |
| parent | 7c27fd19b6d985957424348361afa066ff4c74d8 [diff] | |
| parent | ae7d51517bc3b0fe10c6af38234ef0f92bbae6a4 [diff] |
Merge branch 'acpi-modparam' into release Conflicts: drivers/acpi/Makefile Signed-off-by: Len Brown <len.brown@intel.com>