Merge branch 'upstream-next-davem' of master.kernel.org:/pub/scm/linux/kernel/git...

diff --cc drivers/net/3c509.c
Simple merge

diff --cc drivers/net/Kconfig
Simple merge

diff --cc drivers/net/phy/Kconfig
Simple merge

diff --cc drivers/net/tg3.c
Simple merge

diff --cc drivers/net/usb/rndis_host.c
Simple merge