From: Reinette Chatre <reinette.chatre@intel.com>
Date: Mon, 10 May 2010 22:08:11 +0000 (-0700)
Subject: Merge branch 'wireless-2.6' into wireless-next-2.6
X-Git-Tag: v2.6.35-rc1~473^2~42^2^2~75
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a15707d80ee9a0e0812c5f1a1ed8e41e0a6e52f3;p=pandora-kernel.git

Merge branch 'wireless-2.6' into wireless-next-2.6

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-dev.h
---

a15707d80ee9a0e0812c5f1a1ed8e41e0a6e52f3
Reading git-diff-tree failed