mirror of
https://github.com/torvalds/linux.git
synced 2025-12-07 20:06:24 +00:00
Resolve conflicts in dell/alienware-wmi-wmax and asus-wmi, and enable applying a few amd/hsmp patches that depend on changes in the fixes branch.