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)
commitad86c55bac643a745f480d26689d153ec0f38b04
tree8ae3e20d2f3619021393166fe1f50a8ca00c1c33
parent21eb218989523b7bee28900aaec9f9296b70fa27
parent39731b78b4afebb7501c05b68e2443a1b250b41c
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next into for-davem
MAINTAINERS
drivers/net/wireless/ath/ath9k/xmit.c
net/mac80211/iface.c