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. |
||
|---|---|---|
| .. | ||
| apple.h | ||
| asus-wmi.h | ||
| clk-lpss.h | ||
| clk-pmc-atom.h | ||
| int3472.h | ||
| intel-mid_wdt.h | ||
| intel_pmc_ipc.h | ||
| intel_scu_ipc.h | ||
| nvidia-wmi-ec-backlight.h | ||
| p2sb.h | ||
| pmc_atom.h | ||
| pwm-lpss.h | ||
| simatic-ipc-base.h | ||
| simatic-ipc.h | ||
| soc.h | ||
| spi-intel.h | ||