Merge back earlier acpi-pnp material.

Browse source

Conflicts:
	drivers/pnp/pnpacpi/core.c

...

This commit is contained in:

Rafael J. Wysocki 2014-07-30 00:24:40 +02:00

parent b6328a07bd e70dba6020

commit feb41bb1ca

3 changed files with 28 additions and 67 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

2

drivers/acpi/internal.h

View file

91

drivers/pnp/pnpacpi/core.c

View file

2

include/acpi/acpi_bus.h

View file