summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhostLinus Torvalds2014-12-1816-109/+324
|\
| * virtio_pci: restore module attributesHerbert Xu2014-12-171-0/+5
| * mic/host: fix up virtio 1.0 APIsMichael S. Tsirkin2014-12-151-6/+12
| * vringh: update for virtio 1.0 APIsMichael S. Tsirkin2014-12-152-47/+107
| * vringh: 64 bit featuresMichael S. Tsirkin2014-12-152-4/+4
| * tools/virtio: add virtio 1.0 in vringh_testMichael S. Tsirkin2014-12-151-0/+2
| * tools/virtio: add virtio 1.0 in virtio_testMichael S. Tsirkin2014-12-151-1/+13
| * tools/virtio: enable -WerrorMichael S. Tsirkin2014-12-151-1/+1
| * tools/virtio: 64 bit featuresMichael S. Tsirkin2014-12-151-1/+1
| * tools/virtio: fix vringh testMichael S. Tsirkin2014-12-151-0/+1
| * tools/virtio: more stubsMichael S. Tsirkin2014-12-155-2/+79
| * virtio: core support for config generationMichael S. Tsirkin2014-12-141-4/+28
| * virtio_pci: add VIRTIO_PCI_NO_LEGACYMichael S. Tsirkin2014-12-141-5/+10
| * virtio_pci: move probe to common fileMichael S. Tsirkin2014-12-143-26/+38
| * virtio_pci_common.h: drop VIRTIO_PCI_NO_LEGACYMichael S. Tsirkin2014-12-111-1/+0
| * virtio_config: fix virtio_cread_bytesMichael S. Tsirkin2014-12-111-1/+4
| * virtio: set VIRTIO_CONFIG_S_FEATURES_OK on restoreMichael S. Tsirkin2014-12-111-14/+23
* | Merge tag 'pm+acpi-3.19-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds2014-12-1866-156/+199
|\ \
| | \
| | \
| | \
| | \
| *---. \ Merge branches 'pm-opp', 'pm-cpufreq' and 'pm-tools'Rafael J. Wysocki2014-12-185-38/+97
| |\ \ \ \
| | | | * | Revert "tools: cpupower: fix return checks for sysfs_get_idlestate_count()"Prarit Bhargava2014-12-141-4/+4
| | | * | | MAINTAINERS: add entry for intel_pstateKristen Carlson Accardi2014-12-161-0/+6
| | | * | | intel_pstate: Add a few commentsKristen Carlson Accardi2014-12-111-1/+31
| | | * | | intel_pstate: add kernel parameter to force loadingEthan Zhao2014-12-112-1/+14
| | * | | | PM / OPP: do error handling at the bottom of dev_pm_opp_add_dynamic()Viresh Kumar2014-12-101-7/+10
| | * | | | PM / OPP: handle allocation of device_opp in a separate routineViresh Kumar2014-12-101-15/+22
| | * | | | PM / OPP: reuse find_device_opp() instead of duplicating codeViresh Kumar2014-12-101-7/+2
| | * | | | PM / OPP: Staticize __dev_pm_opp_remove()Viresh Kumar2014-12-101-1/+2
| | * | | | PM / OPP: replace kfree with kfree_rcu while freeing 'struct device_opp'Viresh Kumar2014-12-101-2/+6
| * | | | | Merge branch 'pm-runtime'Rafael J. Wysocki2014-12-1853-97/+68
| |\ \ \ \ \
| | * | | | | power / PM: Eliminate CONFIG_PM_RUNTIMERafael J. Wysocki2014-12-151-4/+0
| | * | | | | NFC / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PMRafael J. Wysocki2014-12-151-1/+1
| | * | | | | SCSI / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PMRafael J. Wysocki2014-12-155-29/+12
| | * | | | | tracing / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PMRafael J. Wysocki2014-12-131-1/+1
| | * | | | | x86 / PM: Replace CONFIG_PM_RUNTIME in io_apic.cRafael J. Wysocki2014-12-131-1/+1
| | * | | | | PM: Remove the SET_PM_RUNTIME_PM_OPS() macroUlf Hansson2014-12-131-2/+0
| | * | | | | mmc: atmel-mci: use SET_RUNTIME_PM_OPS() macroLudovic Desroches2014-12-131-1/+1
| | * | | | | PM / Kconfig: Replace PM_RUNTIME with PM in dependenciesRafael J. Wysocki2014-12-139-10/+10
| | * | | | | ARM / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PMRafael J. Wysocki2014-12-136-7/+7
| | * | | | | sound / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PMRafael J. Wysocki2014-12-1312-18/+15
| | * | | | | phy / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PMRafael J. Wysocki2014-12-132-2/+2
| | * | | | | video / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PMRafael J. Wysocki2014-12-132-3/+3
| | * | | | | tty / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PMRafael J. Wysocki2014-12-135-9/+6
| | * | | | | spi: Replace CONFIG_PM_RUNTIME with CONFIG_PMRafael J. Wysocki2014-12-136-9/+9
| | | | | | |
| | \ \ \ \ \
| | \ \ \ \ \
| | \ \ \ \ \
| *---. \ \ \ \ \ Merge branches 'acpi-fan', 'acpi-video' and 'acpi-ec'Rafael J. Wysocki2014-12-183-3/+17
| |\ \ \ \ \ \ \ \
| | | | * | | | | | ACPI / EC: Fix unexpected ec_remove_handlers() invocationsLv Zheng2014-12-151-0/+2
| | | * | | | | | | ACPI / video: update the skip case for acpi_video_device_in_dod()Aaron Lu2014-12-151-2/+8
| | * | | | | | | | ACPI / Fan: Use bus id as the name for non PNP0C0B (Fan) devicesSrinivas Pandruvada2014-12-111-1/+7
| | | |/ / / / / / | | |/| | | | | |
| | | | | | | | |
| | \ \ \ \ \ \ \
| | \ \ \ \ \ \ \
| | \ \ \ \ \ \ \
| *---. \ \ \ \ \ \ \ Merge branches 'acpi-scan', 'acpi-utils' and 'acpi-pm'Rafael J. Wysocki2014-12-184-15/+14
| |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | ACPI / PM: Do not disable wakeup GPEs that have not been enabledRafael J. Wysocki2014-12-122-2/+11
| | | * | | | | | | | | ACPI / utils: Drop error messages from acpi_evaluate_reference()Rafael J. Wysocki2014-12-121-11/+1
| | | | |/ / / / / / / | | | |/| | | | | | |