Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...

author John W. Linville <linville@tuxdriver.com>

Mon, 25 Mar 2013 20:38:02 +0000 (16:38 -0400)

committer John W. Linville <linville@tuxdriver.com>

Mon, 25 Mar 2013 20:38:02 +0000 (16:38 -0400)
author John W. Linville <linville@tuxdriver.com>
Mon, 25 Mar 2013 20:38:02 +0000 (16:38 -0400)
committer John W. Linville <linville@tuxdriver.com>
Mon, 25 Mar 2013 20:38:02 +0000 (16:38 -0400)
diff --cc drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
Simple merge
diff --cc drivers/net/wireless/iwlegacy/common.c
Simple merge
diff --cc drivers/net/wireless/rt2x00/rt2x00.h
Simple merge
author	John W. Linville <linville@tuxdriver.com>
	Mon, 25 Mar 2013 20:38:02 +0000 (16:38 -0400)
committer	John W. Linville <linville@tuxdriver.com>
	Mon, 25 Mar 2013 20:38:02 +0000 (16:38 -0400)
		1	2
drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlegacy/common.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2x00.h	patch \|	diff1 \|	diff2 \|	blob \| history