Merge branch 'for-john' of git://git.sipsolutions.net/mac80211-next
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 11 Dec 2012 21:04:03 +0000 (16:04 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 11 Dec 2012 21:04:03 +0000 (16:04 -0500)
1  2 
drivers/net/wireless/rt2x00/rt2800lib.c
drivers/net/wireless/rt2x00/rt2x00dev.c
net/mac80211/ibss.c
net/mac80211/scan.c
net/mac80211/status.c

Simple merge
Simple merge
Simple merge