From: Rafael J. Wysocki Date: Mon, 25 Nov 2013 21:30:30 +0000 (+0100) Subject: Merge branches 'acpi-hotplug', 'acpi-sysfs' and 'acpi-sleep' X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=434a438af20865cd41ab08c07281b72637460e41;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git Merge branches 'acpi-hotplug', 'acpi-sysfs' and 'acpi-sleep' * acpi-hotplug: ACPI / hotplug: Fix conflicted PCI bridge notify handlers * acpi-sysfs: ACPI / sysfs: Fix incorrect ACPI tables walk in acpi_tables_sysfs_init() ACPI / sysfs: Set file size for each exposed ACPI table * acpi-sleep: ACPI / sleep: clean up compiler warning about uninitialized field --- 434a438af20865cd41ab08c07281b72637460e41