Merge branch 'acpi-conversion' into acpi-assorted

Browse source

The following commits depend on the 'acpi-conversion' material.

Conflicts:
	drivers/acpi/acpi_platform.c

...

This commit is contained in:

Rafael J. Wysocki 2013-10-16 17:04:41 +02:00

parent e83dda0624 ab0fd674d6

commit c0ad8568c8

3 changed files with 252 additions and 351 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

256

drivers/acpi/ac.c

View file

3

drivers/acpi/acpi_platform.c

View file

376

drivers/platform/x86/ideapad-laptop.c

View file