Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 25 Mar 2013 20:38:02 +0000 (16:38 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 25 Mar 2013 20:38:02 +0000 (16:38 -0400)
commitc78b3841fac9a59c7494be143aa7f2e69ea47958
tree503c1279d2bdf8b295ba7d2eb81830c5eb6bfb32
parent0d4e67174b03e3dcfe75ce7ec488770a5d443bf4
parentf00f188f8212fec9976394976c4fd5d4a3bc4dcf
Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211-next
drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
drivers/net/wireless/iwlegacy/common.c
drivers/net/wireless/rt2x00/rt2x00.h