Conflicts: drivers/acpi/scan.c include/linux/acpi.h Signed-off-by: NLen Brown <len.brown@intel.com>
拖放文件到此处或点击上传
