| commit | ad41ee3a45c7de33cfa0057f4a12362ba1f1af32 | [log] [tgz] |
|---|---|---|
| author | Reinette Chatre <reinette.chatre@intel.com> | Fri Apr 30 15:13:00 2010 -0700 |
| committer | Reinette Chatre <reinette.chatre@intel.com> | Fri Apr 30 15:13:00 2010 -0700 |
| tree | 84ad26649f4fce8a3816351ab1d511cf6c6f0bf1 | |
| parent | 49b5c7f473f1bbcb30275dcaee2c06dfb8ec2279 [diff] | |
| parent | 96ff56419504ac6a610ff1af42330e0423242e16 [diff] |
Merge branch 'wireless-2.6' into wireless-next-2.6 Patch "iwlwifi: work around passive scan issue" was merged into wireless-2.6, but touched a lot of code since modified (and moved) in wireless-next-2.6. This caused some conflicts. Conflicts: drivers/net/wireless/iwlwifi/iwl-scan.c Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>