Merge branch 'wireless-2.6' into wireless-next-2.6
authorReinette Chatre <reinette.chatre@intel.com>
Fri, 25 Jun 2010 21:47:02 +0000 (14:47 -0700)
committerReinette Chatre <reinette.chatre@intel.com>
Fri, 25 Jun 2010 21:47:02 +0000 (14:47 -0700)
commite691e19e05c2cef72cd7f81bcae4195c81d4bf51
treee5a231ecfb36f4fa335b64f1300ce9f831678eee
parent47399f1a7d2059c89df7a1116024d0cd9bc240fa
parent062bee448bd539580ef9f64efe50fdfe04eeb103
Merge branch 'wireless-2.6' into wireless-next-2.6
drivers/net/wireless/ath/ath5k/attach.c
drivers/net/wireless/ath/ath9k/ath9k.h
drivers/net/wireless/ath/ath9k/main.c
drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c
drivers/net/wireless/iwlwifi/iwl-core.c