summaryrefslogtreecommitdiffstats
path: root/drivers/pinctrl/qcom/pinctrl-apq8084.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-11-02 00:54:49 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-11-02 00:54:49 +0100
commit1ab68460b1d0671968b35e04f21efcf1ce051916 (patch)
tree6194aafcc1505556c037abc08645923406149cea /drivers/pinctrl/qcom/pinctrl-apq8084.c
parentMerge branch 'pm-opp' (diff)
parentPM / AVS: rockchip-io: Fix module autoload for OF platform driver (diff)
parentPM / clk: Fix broken build due to non-matching code and header #ifdefs (diff)
parentpowercap / RAPL: Enable Broxton RAPL support (diff)
downloadlinux-1ab68460b1d0671968b35e04f21efcf1ce051916.tar.xz
linux-1ab68460b1d0671968b35e04f21efcf1ce051916.zip
Merge branches 'pm-avs', 'pm-clk' and 'powercap'
* pm-avs: PM / AVS: rockchip-io: Fix module autoload for OF platform driver * pm-clk: PM / clk: Fix broken build due to non-matching code and header #ifdefs * powercap: powercap / RAPL: Enable Broxton RAPL support