diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2022-10-03 19:59:47 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2022-10-03 19:59:47 +0200 |
commit | 7b4baa39de503391b5537c9667b2214a3e6592d5 (patch) | |
tree | 6530504977c9bbe338a05fab4254cc339fa9d134 /drivers/acpi/acpi_video.c | |
parent | b1d03b7ec7215f366d8909efbfcc2fee72328389 (diff) | |
parent | b3c0e38bdb52abd581da70d7048a173f8cf8d327 (diff) | |
parent | f336443acc890434c7d621366d1bc5bc8f298840 (diff) | |
parent | f23470e659964c41697e9c3e950fe80ecae143de (diff) | |
parent | 574160b8548deff8b80b174f03201e94ab8431e2 (diff) | |
parent | 53e7380c9338af588ddbadb4ac9d878351770de4 (diff) | |
download | linux-7b4baa39de503391b5537c9667b2214a3e6592d5.tar.gz linux-7b4baa39de503391b5537c9667b2214a3e6592d5.tar.bz2 linux-7b4baa39de503391b5537c9667b2214a3e6592d5.zip |
Merge branches 'acpi-ec', 'acpi-ac', 'acpi-fan', 'acpi-video' and 'acpi-amba'
Merge EC, AC, fan and backlight driver changes and ACPI AMBA support
update for 6.1-rc1:
- Drop unneeded result variable from ec_write() (ye xingchen).
- Remove the leftover struct acpi_ac_bl from the ACPI AC driver (Hanjun
Guo).
- Reorder symbols to get rid of a few forward declarations in the ACPI
fan driver (Uwe Kleine-König).
- Add Toshiba Satellite/Portege Z830 ACPI backlight quirk (Arvid
Norlander).
- Add ARM DMA-330 controller to the supported list in the ACPI AMBA
driver (Vijayenthiran Subramaniam).
* acpi-ec:
ACPI: EC: Drop unneeded result variable from ec_write()
* acpi-ac:
ACPI: AC: Remove the leftover struct acpi_ac_bl
* acpi-fan:
ACPI: fan: Reorder symbols to get rid of a few forward declarations
* acpi-video:
ACPI: video: Add Toshiba Satellite/Portege Z830 quirk
* acpi-amba:
ACPI: AMBA: Add ARM DMA-330 controller to the supported list