]> git.karo-electronics.de Git - mv-sheeva.git/commit - drivers/net/wireless/rt2x00/rt2500usb.c
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Tue, 16 Nov 2010 17:17:12 +0000 (09:17 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 16 Nov 2010 17:17:12 +0000 (09:17 -0800)
commitb5e4156743c5d42b736936be7a9ee8d72e0e4ac9
treef0edde33e7b2502ab35a4f63be1a8be31f5f4b6a
parent6b35308850e1679741e8b646cfb7bb3ab5369888
parentb1d771ee33c6e4006676002b9d74abf45b71d3d6
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
drivers/net/wireless/ath/ath9k/ath9k.h
drivers/net/wireless/ath/ath9k/hw.c
drivers/net/wireless/ath/ath9k/hw.h
drivers/net/wireless/ath/ath9k/init.c
drivers/net/wireless/ath/ath9k/main.c
drivers/net/wireless/ath/ath9k/recv.c
drivers/net/wireless/ath/carl9170/usb.c
drivers/net/wireless/iwlwifi/iwl3945-base.c