From: Reinette Chatre <reinette.chatre@intel.com>
Date: Fri, 30 Apr 2010 22:13:00 +0000 (-0700)
Subject: Merge branch 'wireless-2.6' into wireless-next-2.6
X-Git-Tag: v2.6.35-rc1~473^2~167^2~49^2~8
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad41ee3a45c7de33cfa0057f4a12362ba1f1af32;p=pandora-kernel.git

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>
---

ad41ee3a45c7de33cfa0057f4a12362ba1f1af32
Reading git-diff-tree failed