Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6532b88 authored Nov 20, 2007 by Len Brown

Pull fluff into release branch



Conflicts:

	drivers/acpi/ec.c

Signed-off-by: Len Brown <len.brown@intel.com>

parents d89a9bda 4fdb2a05

arch/x86/kernel/acpi/sleep_64.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -115,6 +115,3 @@ static int __init acpi_sleep_setup(char *str)

		__setup("acpi_sleep=", acpi_sleep_setup);

		void acpi_pci_link_exit(void)
		{
		}

arch/x86/pci/acpi.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -13,7 +13,7 @@ static int __devinit can_skip_ioresource_align(const struct dmi_system_id *d)
		return 0;
		}

		static struct dmi_system_id acpi_pciprobe_dmi_table[] = {
		static struct dmi_system_id acpi_pciprobe_dmi_table[] __devinitdata = {
		/*
		* Systems where PCI IO resource ISA alignment can be skipped
		* when the ISA enable bit in the bridge control is not set

drivers/acpi/tables/tbutils.c

+1 −1

File changed.

Contains only whitespace changes.

drivers/acpi/ec.c

+2 −2

File changed.

Contains only whitespace changes.

drivers/acpi/processor_core.c

+1 −1

File changed.

Contains only whitespace changes.