]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 20 Feb 2014 20:02:02 +0000 (15:02 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 20 Feb 2014 20:02:02 +0000 (15:02 -0500)
1  2 
drivers/net/wireless/iwlwifi/iwl-drv.c
drivers/net/wireless/iwlwifi/mvm/mac80211.c
net/mac80211/iface.c
net/wireless/chan.c

Simple merge
Simple merge