diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-10-18 12:37:11 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-10-18 12:37:11 +0200 |
| commit | bd371e088bd39d31cf9fa8cb91858a87df404e7f (patch) | |
| tree | e87dad49536efb0057db4e5b173609590a93e85c /fs/nfsd/vfs.c | |
| parent | 3c88a889b4ec8d1ba36cc2d317ed7563677d1d46 (diff) | |
| parent | d737f333b211361b6e239fc753b84c3be2634aaa (diff) | |
| parent | 83b2348e2755db48fa8f40fdb791f366fabc0ba0 (diff) | |
| parent | 719cf71cada1abc4f8727eac918b639a4a502a59 (diff) | |
| parent | 59bbff3775c0951300f7b41345a54b999438f8d0 (diff) | |
| parent | 56f57c07fd084093597f227f4181cf743f582490 (diff) | |
Merge branches 'acpi-init', 'acpi-osl', 'acpi-bus', 'acpi-tables' and 'acpi-misc'
* acpi-init:
ACPI: probe ECDT before loading AML tables regardless of module-level code flag
* acpi-osl:
ACPI / OSL: Use 'jiffies' as the time bassis for acpi_os_get_timer()
* acpi-bus:
ACPI / glue: Split dev_is_platform() out of module for wide use
* acpi-tables:
ACPI/PPTT: Handle architecturally unknown cache types
drivers: base: cacheinfo: Do not populate sysfs for unknown cache types
* acpi-misc:
ACPI: remove redundant 'default n' from Kconfig
ACPI: custom_method: remove meaningless null check before debugfs_remove()