Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
	drivers/net/wireless/iwlwifi/pcie/tx.c

Minor iwlwifi conflict in TX queue disabling between 'net', which
removed a bogus warning, and 'net-next' which added some status
register poking code.

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
Simple merge

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

diff --cc drivers/net/wireless/mwifiex/cmdevt.c
Simple merge

diff --cc drivers/nfc/pn533.c
Simple merge

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

diff --cc net/ipv4/route.c
Simple merge

diff --cc net/mac80211/ibss.c
Simple merge

diff --cc net/nfc/llcp/llcp.c
Simple merge