Merge branch 'device-properties' into acpi-pci
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 2 Nov 2015 00:30:44 +0000 (01:30 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 2 Nov 2015 00:30:44 +0000 (01:30 +0100)
commit5293fea28c9355a12792c4a85c9daad612efc503
tree1c9e05629d719a4532c93686942102ec75af78d1
parent02715e86b21955f107f376d84d165424ba9cd372
parent205ad97fc5a6386214323641dd28b822cb6fc624
Merge branch 'device-properties' into acpi-pci
drivers/gpio/gpiolib.c
include/linux/acpi.h