]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'wireless-2.6' into wireless-next-2.6
authorReinette Chatre <reinette.chatre@intel.com>
Fri, 16 Apr 2010 20:43:40 +0000 (13:43 -0700)
committerReinette Chatre <reinette.chatre@intel.com>
Fri, 16 Apr 2010 20:43:40 +0000 (13:43 -0700)
commite31b5373e72b8e6818ed29cfd0b58f2dfde2bd29
tree5e07f18c04f497833c6b5f043360f5ef58f1f028
parent533a18f14caf42b4ce7cb4a50294873bd2e422d8
parentc52b6cbbcd5485d82d46d74a5ec399eccaaa6c9b
Merge branch 'wireless-2.6' into wireless-next-2.6

Conflicts:
drivers/net/wireless/iwlwifi/iwl-6000.c
drivers/net/wireless/iwlwifi/iwl-6000.c
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl-calib.c
drivers/net/wireless/iwlwifi/iwl-core.c
drivers/net/wireless/iwlwifi/iwl-core.h
drivers/net/wireless/iwlwifi/iwl-dev.h
drivers/net/wireless/iwlwifi/iwl-eeprom.h
drivers/net/wireless/iwlwifi/iwl-scan.c