David S. Miller b20b378d49 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

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>

2016-09-12 15:52:44 -07:00

..

android

Merge tag 'drm-for-v4.8' of git://people.freedesktop.org/~airlied/linux

2016-08-01 21:44:08 -04:00

board

…

clocking-wizard

…

comedi

staging: comedi: ni_mio_common: fix AO inttrig backwards compatibility

2016-08-21 17:07:19 +02:00

dgnc

…

emxx_udc

…

fbtft

…

fsl-mc

…

fwserial

…

gdm724x

…

goldfish

…

gs_fpgaboot

…

i4l

…

iio

staging: iio: ad5933: Return correct value for AD5933_OUT_RANGE.

2016-08-15 15:39:04 +01:00

ks7010

…

lustre

staging/lustre/llite: Close atomic_open race with several openers

2016-08-15 18:25:10 +02:00

media

…

most

…

mt29f_spinand

…

netlogic

…

nvec

…

octeon

net: ethernet: octeon: use phy_ethtool_{get|set}_link_ksettings

2016-08-08 15:42:20 -07:00

octeon-usb

…

olpc_dcon

…

rtl8188eu

…

rtl8192e

…

rtl8192u

…

rtl8712

…

rtl8723au

…

rts5208

…

skein

…

slicoss

…

sm750fb

…

speakup

…

unisys

…

vme

…

vt6655

…

vt6656

…

wilc1000

staging: wilc1000: correctly check if associatedsta has not been found

2016-08-21 17:28:21 +02:00

wlan-ng

…

xgifb

…

Kconfig

…

Makefile

…