diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-06-12 13:42:37 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-06-12 13:42:37 +0200 |
| commit | de815a6d00da0f8a59e8aebf8efe12e289552a8f (patch) | |
| tree | 1dd778c502c12720c925ce9e2df5e982965c4fe6 /drivers/bluetooth/btmrvl_sdio.c | |
| parent | 9d674f2107b7dc801db9780f5f6b645f4905372f (diff) | |
| parent | a4714a898e85205e1118ec923cde43d88eb105f6 (diff) | |
| parent | 751109aad5834375ca9ed0dcfcd85a00cbf872b5 (diff) | |
Merge branches 'acpi-general' and 'acpi-video'
* acpi-general:
ACPI: Fix bug when ACPI reset register is implemented in system memory
* acpi-video:
ACPI / video: Change the default for video.use_native_backlight to 1