summaryrefslogtreecommitdiffstats
path: root/drivers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'pnp-log' into releaseLen Brown2010-10-252-7/+8
|\
| * PNP: log PNP resources, as we do for PCIBjorn Helgaas2010-10-012-7/+8
* | Merge branch 'pnpacpi-invalid-device-id' into releaseLen Brown2010-10-251-5/+24
|\ \
| * | PNPACPI: cope with invalid device IDsDmitry Torokhov2010-10-011-5/+24
| |/
* | Merge branch 'power-refcount' into releaseLen Brown2010-10-251-97/+70
|\ \
| * | ACPI / PM: Fix reference counting of power resourcesRafael J. Wysocki2010-10-231-97/+70
* | | Merge branch 'cleanup' into releaseLen Brown2010-10-251-1/+0
|\ \ \
| * | | ACPI: Remove unused #define ACPI_PROCESSOR_FILE_POWERThomas Renninger2010-10-011-1/+0
| | |/ | |/|
* | | Merge branch 'gpe-defer' into releaseLen Brown2010-10-2512-140/+92
|\ \ \
| * | | ACPI / ACPICA: Defer enabling of runtime GPEs (v3)Rafael J. Wysocki2010-09-2412-140/+92
* | | | Merge branch 'battery' into releaseLen Brown2010-10-251-8/+27
|\ \ \ \
| * | | | ACPI / Battery: Return -ENODEV for unknown values in get_property()Rafael J. Wysocki2010-10-231-8/+27
| | |_|/ | |/| |
* | | | Merge branch 'acpi_pm_device_sleep_state' into releaseLen Brown2010-10-251-6/+10
|\ \ \ \
| * | | | ACPI / PM: Fix problems with acpi_pm_device_sleep_state()Rafael J. Wysocki2010-10-151-6/+10
| | | | |
| \ \ \ \
| \ \ \ \
| \ \ \ \
*---. \ \ \ \ Merge branches 'bugzilla-15807', 'bugzilla-15979-v2' and 'bugzilla-19162' int...Len Brown2010-10-257-25/+66
|\ \ \ \ \ \ \
| | | * | | | | ACPI/PNP: A HID value of an object never changes -> make it constThomas Renninger2010-10-016-10/+11
| | | * | | | | ACPI: Do not export hid/modalias sysfs file for ACPI objects without a HIDThomas Renninger2010-10-011-16/+20
| | | | |_|_|/ | | | |/| | |
| | * | | | | ACPI battery: support percentage battery remaining capacityZhang Rui2010-10-221-1/+37
* | | | | | | Merge branch 'procfs-cleanup-v2' into releaseLen Brown2010-10-2512-1415/+29
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | ACPI: remove unused declaration of proc_fs.hZhang Rui2010-10-153-3/+0
| * | | | | | ACPI processor: make /proc/acpi/processor/*/throttle depends on CONFIG_ACPI_P...Zhang Rui2010-10-152-1/+23
| * | | | | | ACPI video: remove deprecated procfs I/FZhang Rui2010-10-151-770/+1
| * | | | | | ACPI thermal: remove deprecated procfs I/FZhang Rui2010-10-151-435/+1
| * | | | | | ACPI fan: remove deprecated procfs I/FZhang Rui2010-10-151-138/+1
| * | | | | | ACPI ac/battery/sbs: sysfs I/F always built in, procfs I/F disabled by defaultZhang Rui2010-10-154-68/+3
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'acpica' into releaseLen Brown2010-10-2534-684/+1793
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Subject: [PATCH] ACPICA: Fix Scope() op in module level codeBob Moore2010-10-231-2/+17
| * | | | | ACPICA: Clear PCIEXP_WAKE_STS when clearing ACPI eventsColin Ian King2010-10-171-0/+1
| * | | | | ACPICA: Add Vista SP2 to supported _OSI stringsBob Moore2010-10-172-1/+3
| * | | | | ACPICA: Eliminate duplicate code in acpi_ut_execute_* functionsBob Moore2010-10-171-41/+4
| * | | | | ACPICA: Change type of _TZ from ThermalZone to DeviceBob Moore2010-10-171-2/+4
| * | | | | ACPICA: Comment update; no functional changeBob Moore2010-10-171-0/+6
| * | | | | ACPI: add FW_BUG to OSI(Linux) messageLen Brown2010-10-151-1/+1
| * | | | | ACPICA: Increase configurability of error messagesBob Moore2010-10-011-1/+1
| * | | | | ACPICA: Add repair for _HID and _CID stringsBob Moore2010-10-011-0/+163
| * | | | | ACPICA: iASL/Disassembler: Write ACPI errors to stderr instead of output fileBob Moore2010-10-017-287/+445
| * | | | | ACPICA: Make acpi_gbl_system_awake_and_running publically availableBob Moore2010-10-011-1/+1
| * | | | | ACPICA: Update math module; no functional changeBob Moore2010-10-011-3/+20
| * | | | | ACPICA: Make acpi_thread_id no longer configurable, always u64Lin Ming2010-10-017-26/+28
| * | | | | ACPICA: Add ACPI_INLINE configuration parameterLin Ming2010-10-011-2/+2
| * | | | | ACPICA: Obsolete the acpi_os_derive_pci_id OSL interfaceBob Moore2010-10-015-73/+430
| * | | | | ACPICA/ACPI: Add new host interfaces for _OSI supportLin Ming2010-10-0112-193/+593
| * | | | | ACPICA: Revert "Revert "Enable multi-byte EC transfersBob Moore2010-10-013-49/+73
| * | | | | ACPICA: Fix acpi_os_read_pci_configuration prototypeBob Moore2010-10-012-6/+6
| | |_|/ / | |/| | |
* | | | | Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linusLinus Torvalds2010-10-201-0/+1
|\ \ \ \ \
| * | | | | SERIAL: ioc3_serial: Return -ENOMEM on memory allocation failureJulia Lawall2010-10-191-0/+1
* | | | | | virtio: console: Don't block entire guest if host doesn't read dataAmit Shah2010-10-201-3/+14
* | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6Linus Torvalds2010-10-201-2/+2
|\ \ \ \ \ \
| * | | | | | [SCSI] Fix VPD inquiry page wrapperMartin K. Petersen2010-09-161-2/+2
* | | | | | | Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/air...Linus Torvalds2010-10-191-16/+12
|\ \ \ \ \ \ \