Merge branch 'for-john' of git://git.sipsolutions.net/mac80211-next

diff --cc drivers/net/wireless/rt2x00/rt2800lib.c
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt2x00dev.c
Simple merge

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

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

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