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

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-agn.c

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/Makefile
Simple merge

diff --cc drivers/net/ethernet/micrel/ks8842.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-agn-sta.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-agn.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-agn.h
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-core.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-core.h
Simple merge

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

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

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

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