]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 9 Nov 2011 19:49:23 +0000 (14:49 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 9 Nov 2011 19:49:23 +0000 (14:49 -0500)
1  2 
drivers/net/wireless/ath/ath9k/hw.c
drivers/net/wireless/brcm80211/brcmsmac/dma.c
include/net/mac80211.h
net/mac80211/cfg.c
net/mac80211/ieee80211_i.h
net/mac80211/work.c
net/wireless/nl80211.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge