]> 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>
Tue, 13 Jul 2010 19:31:51 +0000 (15:31 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 13 Jul 2010 19:31:51 +0000 (15:31 -0400)
1  2 
drivers/net/wireless/ath/ath9k/hif_usb.c
drivers/net/wireless/iwlwifi/iwl-sta.h