]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit0992b4189e65dd03620ec145d0d76843751fd223
treee5a231ecfb36f4fa335b64f1300ce9f831678eee
parent1c1306a7e262e99caa091ecdbd1c7651e42c8e69
parente0b6d3cb8a2239d68d6fb7abe93b96d509183404
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