Merge branch 'pnp'

Browse source

* pnp:
  PNPACPI: Fix acpi_bus_get_device() check in drivers/pnp/pnpacpi/core.c
  drivers/pnp/pnpbios: remove depends on CONFIG_EXPERIMENTAL

...

This commit is contained in:

Rafael J. Wysocki 2013-02-11 13:31:35 +01:00

parent 17b1639b30 cfc57557f2

commit b34bf8e3cd

2 changed files with 7 additions and 7 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

10

drivers/pnp/pnpacpi/core.c

View file

4

drivers/pnp/pnpbios/Kconfig

View file