summaryrefslogtreecommitdiff
path: root/tools/perf/scripts/python
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-09-13 17:51:23 +0200
committerArnd Bergmann <arnd@arndb.de>2016-09-13 17:51:23 +0200
commit292cc1affba5295f38701caa2004b0ac8f61514e (patch)
tree893afb3fcf4057c4579455601058d5a1f5e6292e /tools/perf/scripts/python
parent3eab887a55424fc2c27553b7bfe32330df83f7b8 (diff)
parent7a988a4dd29a8cfcf405a12441533d765d25a6b8 (diff)
Merge tag 'sunxi-dt-for-4.9-2' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into next/late
Merge "Allwinner DT changes for 4.9, take 2" from Maxime Ripard: A second set of device tree changes, this time switching a few SoCs to the new sunxi-ng clock framework. We also added the support for a new SoC (NextThing GR8 and its evaluation board), and the support for the DRM driver in the A33. To maintain bisectability, while avoiding some un-trivial merge conflicts, I had to merge the clk branch that I've sent a PR to Mike and Stephen. This branch will of course be stable. * tag 'sunxi-dt-for-4.9-2' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux: (53 commits) ARM: dts: gr8: Add support for the GR8 evaluation board ARM: dts: Add NextThing GR8 dtsi ARM: dts: sun8i: Move A23/A33 usbphy and usb_otg nodes to common dtsi ARM: sun8i: a23/a33: Add RGB666 pins ARM: sun8i: a33: Add display pipeline ARM: sun8i: Convert the A23 and A33 to the CCU ARM: dts: sun6i: switch A31/A31s to new CCU clock bindings clk: sunxi-ng: Add hardware dependency clk: sunxi-ng: Add A23 CCU clk: sunxi-ng: Add A33 CCU support clk: sunxi-ng: Add N-class clocks support clk: sunxi-ng: mux: Add mux table macro clk: sunxi-ng: div: Allow to set a maximum clk: sunxi-ng: div: Add kerneldoc for the _ccu_div structure clk: sunxi-ng: div: Add mux table macros devicetree: Add vendor prefix for FriendlyARM ARM: dts: sun8i: Add dts file for the NanoPi NEO SBC ARM: dts: sun8i-q8-common: Add support for SDIO wifi controllers ARM: dts: sun8i: Add dts file for the Orange Pi Plus2E SBC ARM: dts: sun8i: Orange Pi Plus dts is for the Plus and Plus 2 ...
Diffstat (limited to 'tools/perf/scripts/python')
0 files changed, 0 insertions, 0 deletions