diff options
author | 2014-01-12 23:48:18 +0100 | |
---|---|---|
committer | 2014-01-12 23:48:18 +0100 | |
commit | a759012e5f9717a69c2c2f03d6c7fe435e150824 (patch) | |
tree | 4b44266e68b2047fd676201bea70f6de39a647b3 /include/linux/pm.h | |
parent | Merge branches 'acpi-gpe', 'acpi-video', 'acpi-thermal', 'acpi-processor', 'a... (diff) | |
parent | PNPBIOS: check return value of pnp_add_device() (diff) | |
download | linux-a759012e5f9717a69c2c2f03d6c7fe435e150824.tar.gz linux-a759012e5f9717a69c2c2f03d6c7fe435e150824.tar.bz2 linux-a759012e5f9717a69c2c2f03d6c7fe435e150824.zip |
Merge branch 'pnp'
* pnp:
PNPBIOS: check return value of pnp_add_device()
PNP: Mark the function pnp_build_option() as static in resource.c
PNP / card: add missing put_device() call
PNPACPI: check return value of pnp_add_device()
Diffstat (limited to 'include/linux/pm.h')
0 files changed, 0 insertions, 0 deletions