summaryrefslogtreecommitdiffstats
path: root/drivers/pinctrl
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-12-27 00:43:24 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-12-27 00:43:24 +0100
commitbfde19c4c2467cbcb5c11ec0fdaa771b8c16cbce (patch)
treed94273a4948b8409e60c9a66d34eb3c5d420d219 /drivers/pinctrl
parent1a6725359ec20e8505312fbf7ed9592ef830b767 (diff)
parented93b71492da3464b4798613aa8a99bed914251b (diff)
parentf6308b36c411dc5afd6a6f73e6454722bfde57b7 (diff)
Merge branches 'powercap' and 'acpi-lpss' with new device IDs
* powercap: powercap / RAPL: add support for ValleyView Soc * acpi-lpss: ACPI: Add BayTrail SoC GPIO and LPSS ACPI IDs