Reinette Chatre ad41ee3a45 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>

2010-04-30 15:13:00 -07:00

20 KiB

Raw Blame History

View Raw