diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-03-03 00:45:22 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-03-03 00:45:22 +0100 |
| commit | 0cb3b79efabd4174ddeee40c2c1e5499ba67e067 (patch) | |
| tree | 38ef0d5e38240589bac8c7d752295cdbd556742e /drivers/rapidio | |
| parent | 43e31e40473a00c936ffb9c2eebedc0566c92e89 (diff) | |
| parent | 41139ac3cd76c6dff8286102a8ac62933c680463 (diff) | |
| download | linux-0cb3b79efabd4174ddeee40c2c1e5499ba67e067.tar.bz2 | |
Merge branch 'acpi-apei'
* acpi-apei:
ACPI: APEI: Fix BERT resources conflict with ACPI NVS area
Diffstat (limited to 'drivers/rapidio')
0 files changed, 0 insertions, 0 deletions