Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

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

Fri, 21 Mar 2014 18:02:04 +0000 (14:02 -0400)

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

Fri, 21 Mar 2014 18:02:04 +0000 (14:02 -0400)
author John W. Linville <linville@tuxdriver.com>
Fri, 21 Mar 2014 18:02:04 +0000 (14:02 -0400)
committer John W. Linville <linville@tuxdriver.com>
Fri, 21 Mar 2014 18:02:04 +0000 (14:02 -0400)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/net/wireless/ath/wil6210/pcie_bus.c
Simple merge
diff --cc drivers/net/wireless/mwifiex/11n.c
Simple merge
diff --cc net/wireless/chan.c
Simple merge
diff --cc net/wireless/core.c
Simple merge
diff --cc net/wireless/util.c
Simple merge
author	John W. Linville <linville@tuxdriver.com>
	Fri, 21 Mar 2014 18:02:04 +0000 (14:02 -0400)
committer	John W. Linville <linville@tuxdriver.com>
	Fri, 21 Mar 2014 18:02:04 +0000 (14:02 -0400)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/wil6210/pcie_bus.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/11n.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/wireless/chan.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/wireless/core.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/wireless/util.c	patch \|	diff1 \|	diff2 \|	blob \| history