]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'acpi-platform' into acpi-lpss
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 25 May 2014 12:41:02 +0000 (14:41 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 25 May 2014 12:41:02 +0000 (14:41 +0200)
1  2 
drivers/acpi/acpi_lpss.c

Simple merge