Conflicts: drivers/net/ethernet/mediatek/mtk_eth_soc.c drivers/net/ethernet/qlogic/qed/qed_dcbx.c drivers/net/phy/Kconfig All conflicts were cases of overlapping commits. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
---|---|---|
.. | ||
android | ||
board | ||
clocking-wizard | ||
comedi | ||
dgnc | ||
emxx_udc | ||
fbtft | ||
fsl-mc | ||
fwserial | ||
gdm724x | ||
goldfish | ||
gs_fpgaboot | ||
i4l | ||
iio | ||
ks7010 | ||
lustre | ||
media | ||
most | ||
mt29f_spinand | ||
netlogic | ||
nvec | ||
octeon | ||
octeon-usb | ||
olpc_dcon | ||
rtl8188eu | ||
rtl8192e | ||
rtl8192u | ||
rtl8712 | ||
rtl8723au | ||
rts5208 | ||
skein | ||
slicoss | ||
sm750fb | ||
speakup | ||
unisys | ||
vme | ||
vt6655 | ||
vt6656 | ||
wilc1000 | ||
wlan-ng | ||
xgifb | ||
Kconfig | ||
Makefile |