]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 11 Jun 2013 18:48:32 +0000 (14:48 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 11 Jun 2013 18:48:32 +0000 (14:48 -0400)
commit3899ba90a4ab2f3cab8e0f91a76c14ff131c8293
treeae82b469f8a7ceb42547d11dd1fe5c73abc8635b
parent45203a3b380cee28f570475c0d28c169f908c209
parent8b3e7be437a6b62118d0485ad971e724afe23fdf
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

Conflicts:
drivers/net/wireless/ath/ath9k/debug.c
net/mac80211/iface.c
12 files changed:
MAINTAINERS
drivers/net/wireless/ath/ath9k/Kconfig
drivers/net/wireless/ath/ath9k/ar9003_phy.c
drivers/net/wireless/ath/ath9k/ath9k.h
drivers/net/wireless/ath/ath9k/debug.c
drivers/net/wireless/ath/ath9k/debug.h
drivers/net/wireless/ath/ath9k/hw.c
drivers/net/wireless/ath/ath9k/init.c
drivers/net/wireless/ath/ath9k/mac.c
drivers/net/wireless/ath/ath9k/main.c
net/mac80211/iface.c
net/wireless/core.c