]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Wed, 13 Jan 2010 05:33:49 +0000 (21:33 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 13 Jan 2010 05:33:49 +0000 (21:33 -0800)
1  2 
drivers/net/wireless/ath/ath5k/eeprom.c
drivers/net/wireless/zd1211rw/zd_mac.c