diff options
author | Len Brown <len.brown@intel.com> | 2008-03-13 06:59:52 +0100 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2008-03-13 06:59:52 +0100 |
commit | b4de123a0bc4a3f0c90899864d51299628729952 (patch) | |
tree | e5ca53b6d0f6d52f1a15ef99865b545afa08e3fa /kernel/power | |
parent | Merge branches 'release', 'button-sysfs', 'misc', 'mismatch', 'randconfig' an... (diff) | |
parent | ACPI: Do not pass NULL to acpi_get_handle() when looking for _EJD (diff) | |
parent | sony-laptop.c: fix off-by-one (diff) | |
parent | acer-wmi: build depends on i8042 (diff) | |
download | linux-b4de123a0bc4a3f0c90899864d51299628729952.tar.xz linux-b4de123a0bc4a3f0c90899864d51299628729952.zip |
Merge branches 'release', 'ejd', 'sony' and 'wmi' into release