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)
1  2 
drivers/gpio/gpiolib.c
include/linux/acpi.h

Simple merge
Simple merge