]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 15 Feb 2011 23:19:45 +0000 (15:19 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 15 Feb 2011 23:19:45 +0000 (15:19 -0800)
commit09f586b35d8503b57de1e0e9b19bc6b38e0d7319
treef66610ae231f67d5c1239aa3ef73f2941b513f56
parentb9d4ba6b48e9467e2e72bd6fb296b75024466b93
parentdc3397437d740dd7ba5b8d1bf548b7288f564152
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)