summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'pm+acpi-2-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds2013-11-2011-174/+70
|\
| * Merge branch 'acpi-video'Rafael J. Wysocki2013-11-191-75/+12
| |\
| | * ACPI / video: clean up DMI table for initial black screen problemAaron Lu2013-11-151-75/+12
| * | Merge branch 'acpi-ec'Rafael J. Wysocki2013-11-191-1/+2
| |\ \
| | * | ACPI / EC: Ensure lock is acquired before accessing ec struct membersPuneet Kumar2013-11-151-1/+2
| * | | Merge branch 'acpi-hotplug'Rafael J. Wysocki2013-11-192-10/+5
| |\ \ \
| | * | | ACPI / scan: Set flags.match_driver in acpi_bus_scan_fixed()Rafael J. Wysocki2013-11-191-0/+2
| | * | | ACPI / PCI root: Clear driver_data before failing enumerationRafael J. Wysocki2013-11-191-0/+1
| | * | | ACPI / hotplug: Fix PCI host bridge hot removalRafael J. Wysocki2013-11-191-8/+1
| | * | | ACPI / hotplug: Fix acpi_bus_get_device() return value checkRafael J. Wysocki2013-11-191-2/+1
| * | | | Merge branch 'acpi-lpss'Rafael J. Wysocki2013-11-161-0/+9
| |\ \ \ \
| | * | | | ACPI / LPSS: add ACPI IDs for newer Intel PCHsMika Westerberg2013-11-121-0/+9
| | | |/ / | | |/| |
| * | | | Merge branch 'acpi-config'Rafael J. Wysocki2013-11-162-46/+0
| |\ \ \ \
| | * | | | ACPI: delete CONFIG_ACPI_BLACKLIST_YEARLen Brown2013-11-122-46/+0
| | |/ / /
| * | | | ACPI / AC: Remove struct acpi_device pointer from struct acpi_acLan Tianyu2013-11-141-7/+8
| * | | | ACPI / bind: Use (put|get)_device() on ACPI device objects tooRafael J. Wysocki2013-11-141-1/+5
| * | | | ACPI: Eliminate the DEVICE_ACPI_HANDLE() macroRafael J. Wysocki2013-11-141-4/+4
| * | | | ACPI / driver core: Store an ACPI device pointer in struct acpi_dev_nodeRafael J. Wysocki2013-11-143-30/+25
| | |_|/ | |/| |
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2013-11-191-17/+8
|\ \ \ \
| * | | | genetlink: make multicast groups const, prevent abuseJohannes Berg2013-11-191-18/+8
| * | | | genetlink: pass family to functions using groupsJohannes Berg2013-11-191-1/+2
* | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2013-11-151-1/+1
|\ \ \ \ \
| * | | | | treewide: Fix typo in printkMasanari Iida2013-10-141-1/+1
* | | | | | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/l...Linus Torvalds2013-11-141-5/+5
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| | | | | |
| | \ \ \ \
| *-. \ \ \ \ Merge branches 'intel_powerclamp', 'tmon' and 'misc' of .git into nextZhang Rui2013-11-076-178/+29
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | | * | | | ACPI/thermal : Remove zone disabled warningSrinivas Pandruvada2013-09-301-5/+5
| | |/ / / / | |/| | | |
* | | | | | Merge tag 'pci-v3.13-changes' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2013-11-143-110/+160
|\ \ \ \ \ \
| * | | | | | PCI/ACPI: Decode _OSC bitmasks symbolicallyBjorn Helgaas2013-09-231-17/+67
| * | | | | | PCI/ACPI: Separate out _OSC "we don't support enough services" pathBjorn Helgaas2013-09-231-42/+42
| * | | | | | PCI/ACPI: Separate out _OSC "PCIe port services disabled" pathBjorn Helgaas2013-09-231-2/+6
| * | | | | | PCI/ACPI: Skip _OSC control tests if _OSC support call failedBjorn Helgaas2013-09-231-5/+5
| * | | | | | PCI/ACPI: Run _OSC only once for OSPM feature supportBjorn Helgaas2013-09-231-12/+7
| * | | | | | PCI/ACPI: Split _OSC "support" and "control" flags into separate variablesBjorn Helgaas2013-09-231-17/+18
| * | | | | | PCI/ACPI: Move _OSC stuff from acpi_pci_root_add() to negotiate_os_control()Bjorn Helgaas2013-09-231-61/+71
| * | | | | | PCI/ACPI: Drop unnecessary _OSC existence testsBjorn Helgaas2013-09-231-10/+1
| * | | | | | PCI/ACPI: Name _OSC #defines more consistentlyBjorn Helgaas2013-09-231-10/+9
| * | | | | | ACPI: Rename OSC_QUERY_TYPE to OSC_QUERY_DWORDBjorn Helgaas2013-09-233-19/+19
| |/ / / / /
* | | | | | Merge tag 'pm+acpi-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2013-11-14122-2439/+1921
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Merge branch 'acpi-hotplug'Rafael J. Wysocki2013-11-075-217/+137
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | ACPI / hotplug: Consolidate deferred execution of ACPI hotplug routinesRafael J. Wysocki2013-11-075-119/+61
| | * | | | ACPI / hotplug: Do not execute "insert in progress" _OSTRafael J. Wysocki2013-11-071-2/+0
| | * | | | ACPI / hotplug: Carry out PCI root eject directlyRafael J. Wysocki2013-11-073-17/+13
| | * | | | ACPI / hotplug: Merge device hot-removal routinesRafael J. Wysocki2013-11-071-46/+38
| | * | | | ACPI / hotplug: Make acpi_bus_hot_remove_device() internalRafael J. Wysocki2013-11-073-1/+3
| | * | | | ACPI / hotplug: Simplify device ejection routinesRafael J. Wysocki2013-11-072-46/+20
| | * | | | ACPI / hotplug: Fix handle_root_bridge_removal()Rafael J. Wysocki2013-11-071-1/+4
| | * | | | ACPI / hotplug: Refuse to hot-remove all objects with disabled hotplugRafael J. Wysocki2013-11-071-21/+36
| | * | | | ACPI / scan: Start matching drivers after trying scan handlersRafael J. Wysocki2013-11-071-3/+6
| | * | | | ACPI: Remove acpi_pci_slot_init() headers from internal.hRafael J. Wysocki2013-11-071-5/+0
| * | | | | Merge branch 'acpi-video'Rafael J. Wysocki2013-11-072-11/+3
| |\ \ \ \ \