Merge remote-tracking branch 'net-next/master'

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/davicom/dm9000.c
Simple merge

diff --cc drivers/net/ethernet/jme.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/hw.c
Simple merge

diff --cc drivers/virtio/virtio_mmio.c
Simple merge

diff --cc drivers/virtio/virtio_pci.c
Simple merge

diff --cc include/linux/virtio_config.h
Simple merge

diff --cc include/net/inetpeer.h
Simple merge

diff --cc net/mac80211/agg-tx.c
Simple merge

diff --cc net/wireless/nl80211.c
Simple merge