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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/infiniband/core/addr.c
Simple merge

diff --cc drivers/infiniband/ulp/ipoib/ipoib_main.c
Simple merge

diff --cc drivers/net/ethernet/Makefile
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/ethernet/micrel/ks8842.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/netdevice.h
Simple merge

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

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

diff --cc net/core/dev.c
Simple merge

diff --cc net/ipv6/ipv6_sockglue.c
Simple merge

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

diff --cc net/netlabel/netlabel_kapi.c
Simple merge

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