David S. Miller e0ada51db9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts were simple overlapping changes in microchip driver. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-04-21 16:32:48 -04:00
..
arm	dt: bindings: ux500: Add header for PM domains specifiers	2014-10-28 10:47:57 +01:00
bus	dt-bindings: ti-sysc: Update binding for timers and capabilities	2017-12-15 09:39:11 -08:00
clk	Merge branch 'for-v3.16/ti-clk-drv' of github.com:t-kristo/linux-pm into clk-next	2014-06-10 16:53:25 -07:00
clock	The large diff this time around is from the addition of a new clk driver	2018-04-13 15:51:06 -07:00
display	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
dma	devicetree: Add bindings documentation for Analog Devices AXI-DMAC	2015-08-23 18:55:10 +05:30
gpio	ARM: SoC device tree updates for 4.17	2018-04-05 21:18:09 -07:00
i2c	dt-bindings: add header for generic I2C flags in bindings	2015-08-24 14:05:09 +02:00
iio	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
input	Input: gpio-keys - add support for wakeup event action	2018-03-14 10:13:22 -07:00
interrupt-controller	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
leds	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
mailbox	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
media	media: dt-bindings: Add bindings for TDA1997X	2018-02-22 12:45:42 -05:00
memory	dt-bindings: memory: Add Tegra186 support	2017-12-13 12:53:43 +01:00
mfd	dt-bindings: mfd: Add STM32F7 SDMMC2 rcc entry	2018-03-05 09:04:25 +01:00
mips	MIPS: lantiq: Add a GPHY driver which uses the RCU syscon-mfd	2017-09-04 21:19:02 +02:00
mux	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
net	lan78xx: Read LED states from Device Tree	2018-04-20 11:39:09 -04:00
phy	dt-bindings: phy: Add PHY_TYPE_UFS definition	2017-10-23 11:19:27 +05:30
pinctrl	dt-bindings: pinctrl: mediatek: add bindings for I2C2 and SPI2 on MT7623	2018-03-02 08:44:24 +01:00
power	ARM: SoC driver updates for 4.17	2018-04-05 21:29:35 -07:00
pwm	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
regulator	regulator: max77802: Add header for operating modes	2014-10-20 12:23:50 +01:00
reset	The large diff this time around is from the addition of a new clk driver	2018-04-13 15:51:06 -07:00
soc	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
sound	ASoC: rt5651: move definitions of dt-binding constants to include/dt-bindings	2018-03-12 14:15:51 -07:00
spmi	spmi: Linux driver framework for SPMI	2014-02-15 11:55:28 -08:00
thermal	ARM: Device-tree updates for 4.15	2017-11-16 15:48:26 -08:00