diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-02-21 04:28:56 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-02-21 04:28:56 +0100 |
| commit | 9d0de5a63a4a22abfd2bd70694a610d18350cf87 (patch) | |
| tree | 28c6f8ce0301160d7af58e288bea4e4ae83ecdcd | |
| parent | 99fa0ad92c4fd8b529c89b3640b42323984be761 (diff) | |
| parent | 92e4b1bcd6561ff702a57150a00254b8936ea835 (diff) | |
| parent | 3095794ae972bc6fc76af6cb3b864d6686b96094 (diff) | |
| parent | 3120d03cf64d7f9fd71231827af2c1550aa4caa7 (diff) | |
| parent | 6a239af2a3698c488aee798670eca772eb74890b (diff) | |
Merge branches 'acpi-ec', 'acpi-soc', 'acpi-video' and 'acpi-resources'
* acpi-ec:
ACPI / EC: Remove non-standard log emphasis
* acpi-soc:
ACPI / LPSS: Deassert resets for SPI host controllers on Braswell
ACPI / LPSS: Always disable I2C host controllers
Revert "ACPI / LPSS: Remove non-existing clock control from Intel Lynxpoint I2C"
* acpi-video:
ACPI / video: Disable native backlight on Samsung Series 9 laptops
* acpi-resources:
ACPI / resources: Change pr_info() to pr_debug() for debug information