The following commit has been merged in the linux branch: commit bd72f85b9ad6cf41bc771de0cd27d892c41b4396 Merge: 13e356c977473baeb29e8abfd992f0cd938a78ce d59733c1e56784a99381799021c4f9698f3e6379 Author: Linus Torvalds torvalds@linux-foundation.org Date: Thu Oct 15 15:10:27 2009 -0700
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 button: don't try to use a non-existent lid device ACPI: video: Loosen strictness of video bus detection code eeepc-laptop: Prevent a panic when disabling RT2860 wireless when associated eeepc-laptop: Properly annote eeepc_enable_camera(). ACPI / PCI: Fix NULL pointer dereference in acpi_get_pci_dev() (rev. 2) fujitsu-laptop: address missed led-class ifdef fixup ACPI: Kconfig, fix proc aggregator text ACPI: add AC/DC notifier