summaryrefslogtreecommitdiffstats
path: root/drivers/thermal/ti-soc-thermal
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-03-03 00:45:22 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-03-03 00:45:22 +0100
commit0cb3b79efabd4174ddeee40c2c1e5499ba67e067 (patch)
tree38ef0d5e38240589bac8c7d752295cdbd556742e /drivers/thermal/ti-soc-thermal
parent43e31e40473a00c936ffb9c2eebedc0566c92e89 (diff)
parent41139ac3cd76c6dff8286102a8ac62933c680463 (diff)
downloadblackbird-op-linux-0cb3b79efabd4174ddeee40c2c1e5499ba67e067.tar.gz
blackbird-op-linux-0cb3b79efabd4174ddeee40c2c1e5499ba67e067.zip
Merge branch 'acpi-apei'
* acpi-apei: ACPI: APEI: Fix BERT resources conflict with ACPI NVS area
Diffstat (limited to 'drivers/thermal/ti-soc-thermal')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud