summaryrefslogtreecommitdiff
path: root/drivers/uio
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-10-16 02:10:27 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-10-16 02:10:27 +0400
commitbd72f85b9ad6cf41bc771de0cd27d892c41b4396 (patch)
tree3fd0909295dd427c4016dd8c09fae0050e007512 /drivers/uio
parent13e356c977473baeb29e8abfd992f0cd938a78ce (diff)
parentd59733c1e56784a99381799021c4f9698f3e6379 (diff)
downloadlinux-bd72f85b9ad6cf41bc771de0cd27d892c41b4396.tar.xz
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
Diffstat (limited to 'drivers/uio')
0 files changed, 0 insertions, 0 deletions