linux_dsm_epyc7002/arch/arm64/boot/dts
David S. Miller c0cc53162a Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Minor overlapping changes in the conflicts.

In the macsec case, the change of the default ID macro
name overlapped with the 64-bit netlink attribute alignment
fixes in net-next.

Signed-off-by: David S. Miller <davem@davemloft.net>
2016-04-27 15:43:10 -04:00
..
al arm64: dts: alpine: add the MSIX node in the Alpine v2 dtsi 2016-02-26 22:58:10 +01:00
altera arm64: dts: Add base stratix 10 dtsi 2015-10-06 04:42:38 -05:00
amd arm64: dts: amd: Fix-up for ccn504 and kcs nodes 2016-02-24 14:02:19 -08:00
amlogic ARM64: dts: amlogic: Add Tronsmart Vega S95 configs 2016-03-07 11:12:40 +01:00
apm ARM: 64-bit DT updates for v4.6 2016-03-20 15:26:57 -07:00
arm ARM, ARM64: dts: drop "arm,amba-bus" in favor of "simple-bus" 2016-03-12 17:40:34 -08:00
broadcom arm64: dts: vulcan: Update PCI ranges 2016-03-30 00:26:16 +02:00
cavium arm64: dts: Add Cavium ThunderX specific PMU 2016-02-18 18:43:32 +00:00
exynos arm64: EXYNOS: Consolidate ARCH_EXYNOS7 symbol into ARCH_EXYNOS 2016-02-23 08:49:46 +09:00
freescale ARM: 64-bit DT updates for v4.6 2016-03-20 15:26:57 -07:00
hisilicon dts: hisi: update hns dst for separating dsaf dev support 2016-04-26 01:09:18 -04:00
include arm64: Create link to include/dt-bindings to enable C preprocessor use. 2014-11-20 17:51:09 +01:00
marvell arm64: dts: marvell: re-order Device Tree nodes for Armada AP806 2016-02-26 15:17:31 +01:00
mediatek IOMMU Updates for Linux v4.6 2016-03-22 11:57:43 -07:00
nvidia arm64: Fix misspellings in comments. 2016-03-04 18:19:17 +00:00
qcom arm64: dts: qcom: Fix MPP's function used for LED control 2016-02-29 16:17:45 -06:00
renesas arm64: dts: salvator-x: enable USB 2.0 Host of channel 1 and 2 2016-02-26 08:55:32 +09:00
rockchip arm64: dts: rockchip: replace gpio-key,wakeup with wakeup-source property 2016-02-10 00:23:24 +01:00
socionext arm64: dts: uniphier: fix I2C nodes of PH1-LD20 2016-04-23 22:08:35 +02:00
sprd arm64: dts: sprd: adding ETM entries to Spreadtrum SC9836 2015-07-15 06:00:22 -04:00
xilinx ARM64: zynqmp: Extract clock information from EP108 2016-02-25 14:01:03 +01:00
.gitignore arm64: Add dtbs target for building all the enabled dtb files 2012-12-03 17:17:21 -06:00
Makefile This series adds initial support for the Amlogic S905 based 2016-03-12 17:43:08 -08:00