David S. Miller b4b12b0d2f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... The phylink conflict was between a bug fix by Russell King to make sure we have a consistent PHY interface mode, and a change in net-next to pull some code in phylink_resolve() into the helper functions phylink_mac_link_{up,down}() On the dp83867 side it's mostly overlapping changes, with the 'net' side removing a condition that was supposed to trigger for RGMII but because of how it was coded never actually could trigger. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-05-31 10:49:43 -07:00
..
arm	…
bus	bus: ti-sysc: Add support for using ti-sysc for MCAN on dra76x	2018-07-09 22:31:27 -07:00
clk	mfd: lochnagar: Add initial binding documentation	2019-02-07 10:43:55 +00:00
clock	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 13	2019-05-21 11:28:45 +02: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	dt-bindings: dmaengine: dw-dmac: add protection control property	2018-11-24 20:07:22 +05:30
firmware/imx	dt-bindings: firmware: imx-scu: add new resources to scu resource table	2019-03-19 16:46:37 +08:00
gce	dt-bindings: soc: Add documentation for the MediaTek GCE unit	2018-08-03 19:52:14 +05:30
gpio	dt-bindings: gpio: document the new pull-up/pull-down flags	2019-02-13 09:07:43 +01:00
i2c	dt-bindings: add header for generic I2C flags in bindings	2015-08-24 14:05:09 +02:00
iio	dt-bindings: iio/temperature: Add thermocouple types (and doc)	2019-04-04 20:21:01 +01:00
input	Input: gpio-keys - add support for wakeup event action	2018-03-14 10:13:22 -07:00
interconnect	interconnect: qcom: Add sdm845 interconnect provider driver	2019-01-22 13:37:25 +01:00
interrupt-controller	ARM: dt: relicense two DT binding IRQ headers	2018-10-26 07:46:32 -05: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	dt-bindings: tegra186-hsp: Add shared mailboxes	2018-12-21 22:31:26 -06:00
media	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 61	2019-05-24 17:36:45 +02:00
memory	dt-bindings: mediatek: Add binding for mt2712 IOMMU and SMI	2018-07-18 17:01:04 +02:00
mfd	dt-bindings: mfd: Document STPMIC1	2019-01-16 13:59:12 +00: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	dt-bindings: phy: dp83867: Add documentation for disabling clock output	2019-05-22 17:40:17 -07:00
phy	dt-bindings: phy: ti: Add dt binding documentation for SERDES in AM654x SoC	2019-04-17 14:13:18 +05:30
pinctrl	ARM: Device-tree updates	2019-05-16 08:38:17 -07:00
power	dt-bindings: power: r8a77965: Remove non-existent A3IR power domain	2019-03-18 10:33:58 +01: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: act8945a-regulator: Implement PM functionalities	2018-12-12 16:59:04 +00:00
reset	dt-bindings: reset: meson-g12a: Add missing USB2 PHY resets	2019-03-25 16:22:10 +01:00
soc	soc: bcm: bcm2835-pm: Add support for power domains under a new binding.	2019-01-09 16:55:09 +01:00
sound	ASoC: qdsp6: dt-bindings: Add q6afe display_port dt binding	2018-12-14 12:48:48 +00:00
spmi	…
thermal	of: Add bindings of gpu hw throttle for Tegra soctherm	2019-05-13 20:35:33 -07:00
usb	dt-bindings: connector: Add support for USB-PD PPS APDOs to bindings	2018-09-20 12:56:02 +02:00