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
bus	dt-bindings: ti-sysc: Update binding for timers and capabilities	2017-12-15 09:39:11 -08:00
clk
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
dma
gpio	ARM: SoC device tree updates for 4.17	2018-04-05 21:18:09 -07:00
i2c
iio
input	Input: gpio-keys - add support for wakeup event action	2018-03-14 10:13:22 -07:00
interrupt-controller
leds
mailbox
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
mux
net	lan78xx: Read LED states from Device Tree	2018-04-20 11:39:09 -04:00
phy
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
regulator
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
sound	ASoC: rt5651: move definitions of dt-binding constants to include/dt-bindings	2018-03-12 14:15:51 -07:00
spmi
thermal