diff options
| author | Reinette Chatre <reinette.chatre@intel.com> | 2010-05-01 00:13:00 +0200 |
|---|---|---|
| committer | Reinette Chatre <reinette.chatre@intel.com> | 2010-05-01 00:13:00 +0200 |
| commit | ad41ee3a45c7de33cfa0057f4a12362ba1f1af32 (patch) | |
| tree | 84ad26649f4fce8a3816351ab1d511cf6c6f0bf1 /usr | |
| parent | mac80211: tell driver about IBSS merge (diff) | |
| parent | iwlwifi: work around passive scan issue (diff) | |
| download | linux-ad41ee3a45c7de33cfa0057f4a12362ba1f1af32.tar.xz linux-ad41ee3a45c7de33cfa0057f4a12362ba1f1af32.zip | |
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>
Diffstat (limited to 'usr')
0 files changed, 0 insertions, 0 deletions