diff options
author | Tony Lindgren <tony@atomide.com> | 2015-04-01 21:24:29 +0200 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2015-04-01 21:24:29 +0200 |
commit | 21295368367beaa563b310d5492166dba158b884 (patch) | |
tree | c8a7c44beff93c040c76788ce2f6f4916281cbd8 /Documentation/devicetree/bindings/crypto/fsl-sec4.txt | |
parent | ARM: DRA7: Enable Cortex A15 errata 798181 (diff) | |
parent | ARM: OMAP4+: control: add support for initializing control module via DT (diff) | |
download | linux-21295368367beaa563b310d5492166dba158b884.tar.xz linux-21295368367beaa563b310d5492166dba158b884.zip |
Merge branch '4.0-rc1-prcm-cleanup-v6' of https://github.com/t-kristo/linux-pm into omap-for-v4.1/prcm-cleanup
Conflicts:
arch/arm/boot/dts/dra7.dtsi
Diffstat (limited to 'Documentation/devicetree/bindings/crypto/fsl-sec4.txt')
0 files changed, 0 insertions, 0 deletions