mirror of
https://github.com/torvalds/linux.git
synced 2026-06-26 16:14:17 +02:00
This was another merge problem that wasn't a data conflict, but due to
independent changes in two branches that just didn't work together.
The pcc-acpi staging driver used
acpi_driver_data(device) = hotkey;
to set driver data, but the ACPI merge made that invalid in commit
|
||
|---|---|---|
| .. | ||
| at76_usb | ||
| echo | ||
| et131x | ||
| go7007 | ||
| me4000 | ||
| pcc-acpi | ||
| poch | ||
| slicoss | ||
| sxg | ||
| usbip | ||
| winbond | ||
| wlan-ng | ||
| Kconfig | ||
| Makefile | ||
| staging.c | ||