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)
commitc66cfd5325bb215a251f4685fac8718b1da33197
tree7c8ed5289c4a99ffcd2588ac48b5a512312a375b
parentecbbec2eb093d2ef205de371af986f0360fca539
parent8acbcddb5fb3a1dc081defe51b6ac42a7ab0b398
Merge branch 'for-john' of git://git.sipsolutions.net/mac80211-next
drivers/net/wireless/rt2x00/rt2800lib.c
drivers/net/wireless/rt2x00/rt2x00dev.c
net/mac80211/ibss.c
net/mac80211/scan.c
net/mac80211/status.c