| commit | 09f586b35d8503b57de1e0e9b19bc6b38e0d7319 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Feb 15 15:19:45 2011 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Feb 15 15:19:45 2011 -0800 |
| tree | f66610ae231f67d5c1239aa3ef73f2941b513f56 | |
| parent | b9d4ba6b48e9467e2e72bd6fb296b75024466b93 [diff] | |
| parent | dc3397437d740dd7ba5b8d1bf548b7288f564152 [diff] |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: ACPI / Video: Probe for output switch method when searching video devices. ACPI / Wakeup: Enable button GPEs unconditionally during initialization ACPI / ACPICA: Avoid crashing if _PRW is defined for the root object ACPI: Fix acpi_os_read_memory() and acpi_os_write_memory() (v2)