]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 3 Aug 2011 13:18:21 +0000 (09:18 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 3 Aug 2011 13:18:21 +0000 (09:18 -0400)
commita5d5a914770a81a1f775be2ee35b9fa8fd19d381
treeed07597966e91e3903faf305d69a2c5e1d109b91
parentd5eab9152a3b4ce962c02ad0a0e4d0ec94aadd92
parentf35291082294ca6737953bbe4e9491ede04ab822
Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
drivers/net/wireless/ath/ath9k/init.c
drivers/net/wireless/rt2x00/rt2800lib.c