summaryrefslogtreecommitdiffstats
path: root/drivers/char/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-12-31 01:00:24 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-31 01:00:24 +0100
commit08d869aa8683703c4a60fdc574dd0809f9b073cd (patch)
treef9b875013297130d50a66336899962d15530a07b /drivers/char/Makefile
parentMerge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/as... (diff)
parentMerge branch 'resume-sci-force-bootparam' into release (diff)
downloadlinux-08d869aa8683703c4a60fdc574dd0809f9b073cd.tar.xz
linux-08d869aa8683703c4a60fdc574dd0809f9b073cd.zip
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: introduce kernel parameter acpi_sleep=sci_force_enable ACPI: WMI: Survive BIOS with duplicate GUIDs dell-wmi - fix condition to abort driver loading wmi: check find_guid() return value to prevent oops dell-wmi, hp-wmi, msi-wmi: check wmi_get_event_data() return value ACPI: hp-wmi, msi-wmi: clarify that wmi_install_notify_handler() returns an acpi_status dell-wmi: sys_init_module: 'dell_wmi'->init suspiciously returned 21, it should ACPI video: correct error-handling code ACPI video: no warning message if "acpi_backlight=vendor" is used ACPI: fix ACPI=n allmodconfig build thinkpad-acpi: improve Kconfig help text thinkpad-acpi: update volume subdriver documentation thinkpad-acpi: make volume subdriver optional thinkpad-acpi: don't fail to load the entire module due to ALSA problems thinkpad-acpi: don't take the first ALSA slot by default
Diffstat (limited to 'drivers/char/Makefile')
0 files changed, 0 insertions, 0 deletions