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

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

diff --cc Documentation/feature-removal-schedule.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

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

diff --cc drivers/net/ethernet/marvell/mv643xx_eth.c
Simple merge

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

diff --cc drivers/net/ethernet/natsemi/macsonic.c
Simple merge

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

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

diff --cc net/nfc/nci/core.c
Simple merge

diff --cc net/sunrpc/svc.c
Simple merge

diff --cc net/sunrpc/svc_xprt.c
Simple merge

diff --cc net/sunrpc/svcsock.c
Simple merge