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

author Stephen Rothwell <sfr@canb.auug.org.au>

Tue, 22 Nov 2011 02:58:45 +0000 (13:58 +1100)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Tue, 22 Nov 2011 02:58:45 +0000 (13:58 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 22 Nov 2011 02:58:45 +0000 (13:58 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 22 Nov 2011 02:58:45 +0000 (13:58 +1100)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
Simple merge
diff --cc net/mac80211/status.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 22 Nov 2011 02:58:45 +0000 (13:58 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 22 Nov 2011 02:58:45 +0000 (13:58 +1100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/mac80211/status.c	patch \|	diff1 \|	diff2 \|	blob \| history