diff options
author | Len Brown <len.brown@intel.com> | 2009-04-05 07:45:50 +0200 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2009-04-05 07:45:50 +0200 |
commit | edd84690d15e4cb144cc60b754d4eaf8fac0a711 (patch) | |
tree | 4fc645c52ad9eebcdf59a6ab32d534df121dd280 /.mailmap | |
parent | Merge branch 'sony-laptop' into release (diff) | |
parent | ACPI: simplify processor lines in Makefile (diff) | |
download | linux-edd84690d15e4cb144cc60b754d4eaf8fac0a711.tar.xz linux-edd84690d15e4cb144cc60b754d4eaf8fac0a711.zip |
Merge branch 'acpi-modparam' into release
Conflicts:
drivers/acpi/Makefile
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions