Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
John W. Linville [Wed, 20 Mar 2013 19:24:57 +0000 (15:24 -0400)]
1  2 
MAINTAINERS
drivers/net/wireless/ath/wil6210/txrx.c
drivers/net/wireless/iwlegacy/4965-mac.c
drivers/net/wireless/iwlegacy/common.c
drivers/net/wireless/iwlegacy/common.h
drivers/net/wireless/iwlwifi/pcie/tx.c
drivers/net/wireless/rt2x00/rt2x00pci.c

diff --cc MAINTAINERS
Simple merge