mirror_ubuntu-kernels/arch/arm64/boot/dts
David S. Miller 4963ed48f2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	net/ipv4/arp.c

The net/ipv4/arp.c conflict was one commit adding a new
local variable while another commit was deleting one.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-09-26 16:08:27 -07:00
..
amd arm64: amd-seattle: Fix PCI bus range due to SMMU limitation 2014-12-04 17:10:34 +01:00
apm dtb: xgene: Add 2nd 10GbE node 2015-09-15 12:47:46 -07:00
arm ARM64: dts: vexpress: Use assigned-clock-parents for sp810 2015-08-18 13:17:48 -07:00
broadcom arm64: dts: Add Broadcom North Star 2 support 2015-07-29 22:07:11 +02:00
cavium GICv3: Add ITS entry to THUNDER dts 2015-07-08 14:24:57 -07:00
exynos arm64: dts: Add nodes for mmc, i2c, rtc, watchdog, adc on exynos7 2014-12-23 00:19:08 +09:00
freescale arm64: Add DTS support for FSL's LS2085A SoC 2015-01-27 15:11:00 -08:00
hisilicon net: add Hisilicon Network Subsystem support (config and documents) 2015-09-20 21:42:57 -07: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: Add dts files for Marvell Berlin4CT SoC 2015-08-03 20:45:54 +02:00
mediatek Documentation: arm: Fix typo in the idle-states bindings examples 2015-09-24 17:55:32 -05:00
qcom arm64: dts: qcom: Add apq8016-sbc board LED's related device nodes 2015-07-28 16:19:13 -05:00
rockchip Documentation: arm: Fix typo in the idle-states bindings examples 2015-09-24 17:55:32 -05:00
sprd arm64: dts: sprd: adding ETM entries to Spreadtrum SC9836 2015-07-15 06:00:22 -04:00
xilinx ARM64: zynqmp: Move SPI nodes to the right location 2015-07-31 10:46:34 +02:00
.gitignore arm64: Add dtbs target for building all the enabled dtb files 2012-12-03 17:17:21 -06:00
Makefile Initial support for Marvell Berlin4CT ARM64 SoC 2015-08-13 14:48:09 +02:00