Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into...
commit11ad2f52826ac6d58d6780d3d8a3e098c88d9142
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 27 May 2011 19:18:35 +0000 (27 15:18 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 27 May 2011 19:18:35 +0000 (27 15:18 -0400)
tree92206a4063520aa749f0086f5addb9889f6d6b6f
parentc5c177b4aca83338781e72be2e6dd1601c560cb3
parent1df85ecec36ad5da3f0165760704310d6c03f65f
Merge git://git./linux/kernel/git/linville/wireless-next-2.6 into for-davem
drivers/net/wireless/ath/ath9k/main.c
drivers/net/wireless/ath/ath9k/rc.c