]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'for-davem' of ssh://master.kernel.org/pub/scm/linux/kernel/git/linville...
authorDavid S. Miller <davem@davemloft.net>
Fri, 4 Mar 2011 20:48:25 +0000 (12:48 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 4 Mar 2011 20:48:25 +0000 (12:48 -0800)
1  2 
drivers/net/wireless/ath/ath9k/hif_usb.c
drivers/net/wireless/iwlwifi/iwl-5000.c