Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
John W. Linville [Thu, 30 Jun 2011 17:34:06 +0000 (13:34 -0400)]
1  2 
drivers/net/wireless/ath/ath9k/ath9k.h
drivers/net/wireless/ath/ath9k/beacon.c
drivers/net/wireless/ath/ath9k/init.c
drivers/net/wireless/ath/ath9k/xmit.c
drivers/net/wireless/libertas_tf/main.c
drivers/net/wireless/rtlwifi/wifi.h

Simple merge
Simple merge
Simple merge