Merge branches 'release' and 'fluff' into release
Conflicts: drivers/acpi/scan.c include/linux/acpi.h Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
@@ -391,7 +391,6 @@ int acpi_bus_receive_event(struct acpi_bus_event *event)
|
||||
return 0;
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL(acpi_bus_receive_event);
|
||||
#endif /* CONFIG_ACPI_PROC_EVENT */
|
||||
|
||||
/* --------------------------------------------------------------------------
|
||||
|
Reference in New Issue
Block a user