diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-18 20:43:16 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-18 20:43:16 +0300 |
| commit | 0a0666428680c4a68d050491d5323a2ef05e08a7 (patch) | |
| tree | 8c231099549e3fb6925d7804e4524b44aeb2891b /fs/nfsd/nfs4xdr.c | |
| parent | be10f60d29433f712bf0887431efb80975e64438 (diff) | |
| parent | bbb16fef19122ec9f20fb865c45375e12f85d2a1 (diff) | |
| parent | b4df463678fb9c6dae9548dbb7545993779fd416 (diff) | |
| parent | 1741acea75ea51ce709304a26baf72e1e99b8f3a (diff) | |
| download | linux-0a0666428680c4a68d050491d5323a2ef05e08a7.tar.xz | |
Merge branches 'acpi-fan', 'acpi-video' and 'acpi-ec'
* acpi-fan:
ACPI / Fan: Use bus id as the name for non PNP0C0B (Fan) devices
* acpi-video:
ACPI / video: update the skip case for acpi_video_device_in_dod()
* acpi-ec:
ACPI / EC: Fix unexpected ec_remove_handlers() invocations