summaryrefslogtreecommitdiffstats
path: root/Documentation/target/tcmu-design.txt
diff options
context:
space:
mode:
authorKevin Hilman <khilman@linaro.org>2015-06-25 06:32:26 +0200
committerKevin Hilman <khilman@linaro.org>2015-06-25 06:32:26 +0200
commit32270e805a1e0baf39aa040177ef1896f03b7266 (patch)
tree89f8ac72b98d4f37377fa58f3fa9804dd32f2350 /Documentation/target/tcmu-design.txt
parentMerge tag 'armsoc-dt' into test-merge (diff)
parentdrivers: soc: sunxi: Introduce SoC driver to map SRAMs (diff)
downloadlinux-32270e805a1e0baf39aa040177ef1896f03b7266.tar.xz
linux-32270e805a1e0baf39aa040177ef1896f03b7266.zip
Merge tag 'armsoc-drivers' into test-merge
ARM: SoC: driver updates for v4.2 Some of these are for drivers/soc, where we're now putting SoC-specific drivers these days. Some are for other driver subsystems where we have received acks from the appropriate maintainers. Some highlights: - simple-mfd: document DT bindings and misc updates - migrate mach-berlin to simple-mfd for clock, pinctrl and reset - memory: support for Tegra132 SoC - memory: introduce tegra EMC driver for scaling memory frequency - misc. updates for ARM CCI and CCN busses Conflicts: arch/arm64/boot/dts/arm/juno-motherboard.dtsi Trivial add/add conflict with our dt branch. Resolution: take both sides. # gpg: Signature made Wed Jun 24 21:32:17 2015 PDT using RSA key ID D3FBC665 # gpg: Good signature from "Kevin Hilman <khilman@deeprootsystems.com>" # gpg: aka "Kevin Hilman <khilman@linaro.org>" # gpg: aka "Kevin Hilman <khilman@kernel.org>" # Conflicts: # arch/arm64/boot/dts/arm/juno-motherboard.dtsi
Diffstat (limited to 'Documentation/target/tcmu-design.txt')
0 files changed, 0 insertions, 0 deletions