Conflicts: arch/x86_64/pci/mmconfig.c drivers/acpi/bay.c Signed-off-by: Len Brown <len.brown@intel.com> |
||
|---|---|---|
| .. | ||
| boot.c | ||
| cstate.c | ||
| earlyquirk.c | ||
| Makefile | ||
| processor.c | ||
| sleep.c | ||
| wakeup.S | ||
Conflicts: arch/x86_64/pci/mmconfig.c drivers/acpi/bay.c Signed-off-by: Len Brown <len.brown@intel.com> |
||
|---|---|---|
| .. | ||
| boot.c | ||
| cstate.c | ||
| earlyquirk.c | ||
| Makefile | ||
| processor.c | ||
| sleep.c | ||
| wakeup.S | ||