David S. Miller
c4c5551df1
Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux
...
All conflicts were trivial overlapping changes, so reasonably
easy to resolve.
Signed-off-by: David S. Miller <davem@davemloft.net >
2018-07-20 21:17:12 -07:00
Jonathan Neuschäfer
a47c9b3943
dt-bindings: Fix unbalanced quotation marks
...
Multiple binding documents have various forms of unbalanced quotation
marks. Fix them.
Signed-off-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net >
Acked-by: Krzysztof Kozlowski <krzk@kernel.org >
Acked-by: Jon Hunter <jonathanh@nvidia.com >
Acked-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org >
Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com >
Acked-by: Florian Fainelli <f.fainelli@gmail.com >
Signed-off-by: Rob Herring <robh@kernel.org >
2018-06-26 14:17:22 -06:00
Yangbo Lu
2cb785b496
dt-binding: ptp_qoriq: add DPAA FMan support
...
This patch is to add bindings description for DPAA
FMan 1588 timer, and also remove its description in
fsl-fman dt-bindings document.
Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com >
Reviewed-by: Rob Herring <robh@kernel.org >
Acked-by: Richard Cochran <richardcochran@gmail.com >
Acked-by: Madalin Bucur <madalin.bucur@nxp.com >
Signed-off-by: David S. Miller <davem@davemloft.net >
2018-06-26 22:15:14 +09:00
Madalin Bucur
08cd94ec52
dt-bindings: net: move FMan binding
...
Besides the PPC SoCs, the QorIQ DPAA FMan is also present on ARM SoCs,
moving the device tree binding document into the bindings/net folder.
Signed-off-by: Madalin Bucur <madalin.bucur@nxp.com >
Signed-off-by: Rob Herring <robh@kernel.org >
2017-05-30 16:41:10 -05:00
