summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-08-03 20:30:18 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-08-03 20:30:18 +0200
commit3de559d4df546442e28fab91e1c9cab3f19ca24f (patch)
treea652899cd392f0d5cbadfa62f2a845099ac4f65a /drivers
parent16f73eb02d7e1765ccab3d2018e0bd98eb93d973 (diff)
parentf7f3dd5b4cbb138ed4559b0d096bab76a8f476de (diff)
parent31e86cb99a3af0653f0e317fdd9c05b530c70af8 (diff)
parentecfc1599ef8759a17bf40f12a75f8420c471be9a (diff)
downloadlinux-3de559d4df546442e28fab91e1c9cab3f19ca24f.tar.bz2
Merge branches 'acpi-soc', 'acpi-wdat' and 'acpi-cppc'
* acpi-soc: ACPI: APD: Fix HID for Hisilicon Hip07/08 ACPI / LPSS: Only call pwm_add_table() for the first PWM controller * acpi-wdat: ACPI / watchdog: Fix init failure with overlapping register regions * acpi-cppc: mailbox: pcc: Fix crash when request PCC channel 0