diff options
| author |   Len Brown <len.brown@intel.com> | 2008-02-07 03:25:48 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-02-07 03:25:48 -0500 |
| commit | 52b097fff89b14c0b8b7a7deef1d274889b1886d (patch) | |
| tree | 21eb2e3f9835bcc9d0e418e1630321677bf0e86e /scripts/patch-kernel | |
| parent | Merge branches 'release' and 'wmi-2.6.25' into release (diff) | |
| parent | Merge branches 'release' and 'wmi-2.6.25' into release (diff) | |
| parent | ACPI: video: Ignore ACPI video devices that aren't present in hardware (diff) | |
Merge branches 'release' and 'video' into release
Conflicts:
include/acpi/acpi_bus.h
Signed-off-by: Len Brown <len.brown@intel.com>