Merge remote-tracking branch 'wireless/master'

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

Sun, 13 Nov 2011 23:32:37 +0000 (10:32 +1100)

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

Sun, 13 Nov 2011 23:32:37 +0000 (10:32 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Sun, 13 Nov 2011 23:32:37 +0000 (10:32 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Sun, 13 Nov 2011 23:32:37 +0000 (10:32 +1100)
diff --cc net/mac80211/mlme.c
Simple merge
diff --cc net/mac80211/rx.c
Simple merge
diff --cc net/mac80211/util.c
Simple merge
diff --cc net/wireless/reg.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Sun, 13 Nov 2011 23:32:37 +0000 (10:32 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Sun, 13 Nov 2011 23:32:37 +0000 (10:32 +1100)
		1	2
net/mac80211/mlme.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/mac80211/rx.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/mac80211/util.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/wireless/reg.c	patch \|	diff1 \|	diff2 \|	blob \| history