diff options
| author | Grant Likely <grant.likely@linaro.org> | 2014-11-24 17:50:07 +0300 |
|---|---|---|
| committer | Grant Likely <grant.likely@linaro.org> | 2014-11-24 17:50:07 +0300 |
| commit | 66e6a5a1fcd2f3e05f4d499b539a1f77ceb52d1d (patch) | |
| tree | d72f980f64b88ea4e976215a503fcb038e02f981 /Documentation/devicetree/bindings/pinctrl/qcom,apq8064-pinctrl.txt | |
| parent | 2d0747c4b68be8eb8ccfa2c538f2f5dd2ea89094 (diff) | |
| parent | 5d01410fe4d92081f349b013a2e7a95429e4f2c9 (diff) | |
| download | linux-66e6a5a1fcd2f3e05f4d499b539a1f77ceb52d1d.tar.xz | |
Merge tag 'v3.18-rc6' into devicetree/next
v3.18-rc6 contains an important DT bug fix, c1a2086e2d, "of/selftest:
Fix off-by-one error in removal path" which affects testing of the
overlay patch series. Merge it into the devicetree/next staging branch
so that the overlay patches are applied on top of a known working tree.
Linux 3.18-rc6
Conflicts:
drivers/of/address.c
Diffstat (limited to 'Documentation/devicetree/bindings/pinctrl/qcom,apq8064-pinctrl.txt')
| -rw-r--r-- | Documentation/devicetree/bindings/pinctrl/qcom,apq8064-pinctrl.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/pinctrl/qcom,apq8064-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/qcom,apq8064-pinctrl.txt index 2fb90b37aa09..a7bde64798c7 100644 --- a/Documentation/devicetree/bindings/pinctrl/qcom,apq8064-pinctrl.txt +++ b/Documentation/devicetree/bindings/pinctrl/qcom,apq8064-pinctrl.txt @@ -18,7 +18,7 @@ Please refer to pinctrl-bindings.txt in this directory for details of the common pinctrl bindings used by client devices, including the meaning of the phrase "pin configuration node". -Qualcomm's pin configuration nodes act as a container for an abitrary number of +Qualcomm's pin configuration nodes act as a container for an arbitrary number of subnodes. Each of these subnodes represents some desired configuration for a pin, a group, or a list of pins or groups. This configuration can include the mux function to select on those pin(s)/group(s), and various pin configuration |