summaryrefslogtreecommitdiff
path: root/proto_vlan_q_in_q.c
diff options
context:
space:
mode:
Diffstat (limited to 'proto_vlan_q_in_q.c')
0 files changed, 0 insertions, 0 deletions
/table>
Merge tag 'amlogic-dt64-2-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into next/dt64
Pull "Amlogic 64-bit DT updates for v4.10, round 2" from Kevin Hilman: - new SoC support: S912/GXM series (8x A53) - new boards: Nexbox A1 (S912), Nexbox A95X (S905X) - resets for 2nd USB PHY - update SCPI compatible for pre-v1.0 devices * tag 'amlogic-dt64-2-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic: ARM64: dts: meson-gxbb: add SCPI pre-1.0 compatible ARM64: dts: meson-gxl: Add support for Nexbox A95X ARM64: dts: meson-gxm: Add support for the Nexbox A1 ARM64: dts: Add support for Meson GXM ARM64: dts: meson-gxbb: add the USB reset also to the second USB PHY
Diffstat