David S. Miller 0f3e9c97eb Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... All of the conflicts were cases of overlapping changes. In net/core/devlink.c, we have to make care that the resouce size_params have become a struct member rather than a pointer to such an object. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-03-06 01:20:46 -05:00
..
actions	soc: actions: sps: Add S700	2017-11-27 23:11:01 +01:00
amlogic	meson-gx-socinfo: Fix package id parsing	2017-11-30 15:29:44 -08:00
atmel	drivers: soc: atmel: Add basic support for new sama5d2 SiPs	2017-09-17 19:45:59 +02:00
bcm	soc: bcm: brcmstb: Be multi-platform compatible	2018-01-15 15:47:07 +01:00
dove	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
fsl	soc: fsl: guts: Add a NULL check for devm_kasprintf()	2018-01-22 16:59:48 -06:00
gemini	soc: Add SoC driver for Gemini	2018-01-04 17:01:53 +01:00
imx	ARM: SoC fixes for 4.16	2018-02-28 16:11:04 -08:00
lantiq	MIPS: lantiq: Add a GPHY driver which uses the RCU syscon-mfd	2017-09-04 21:19:02 +02:00
mediatek	soc: mediatek: add MT2712 scpsys support	2017-12-21 11:49:23 +01:00
qcom	net: make getname() functions return length rather than use int* parameter	2018-02-12 14:15:04 -05:00
renesas	soc: renesas: rcar-sysc: Keep wakeup sources active during system suspend	2017-12-20 11:16:05 +01:00
rockchip	soc: rockchip: power-domain: Use GENPD_FLAG_ACTIVE_WAKEUP	2017-11-08 01:00:47 +01:00
samsung	soc: samsung: Add SPDX license identifiers	2018-01-03 18:45:15 +01:00
sunxi	drivers: soc: sunxi: add support for A64 and its SRAM C	2017-08-18 14:30:21 +08:00
tegra	soc/tegra: fuse: Explicitly request DMA channel from APB DMA driver	2017-12-21 17:04:12 +01:00
ti	soc: ti: fix max dup length for kstrndup	2017-12-16 14:45:33 -08:00
ux500	ARM: ux500: move soc_id driver to drivers/soc	2016-07-12 11:24:09 +02:00
versatile	soc: versatile: remove unnecessary static in realview_soc_probe()	2017-08-16 22:28:27 +02:00
xilinx	soc: xilinx: Fix Kconfig alignment	2018-01-16 15:50:21 +01:00
zte	soc: zte: Restrict SOC_ZTE to ARCH_ZX or COMPILE_TEST	2017-07-27 13:12:34 +02:00
Kconfig	soc: xilinx: Create folder structure for soc specific drivers	2018-01-08 13:42:39 +01:00
Makefile	ARM: SoC driver updates for 4.16	2018-02-01 16:35:31 -08:00