Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 1 Jan 2014 20:39:56 +0000 (15:39 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 1 Jan 2014 20:39:56 +0000 (15:39 -0500)
1  2 
MAINTAINERS
drivers/net/wireless/ath/ath9k/xmit.c
net/mac80211/iface.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge