From: Reinette Chatre <reinette.chatre@intel.com>
Date: Fri, 16 Apr 2010 20:43:40 +0000 (-0700)
Subject: Merge branch 'wireless-2.6' into wireless-next-2.6
X-Git-Tag: v2.6.35-rc1~473^2~393^2~25^2~21
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8715fa28fb4fad62f6004d276ec8e1aa5e664e76;p=pandora-kernel.git

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

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-6000.c
---

8715fa28fb4fad62f6004d276ec8e1aa5e664e76
Reading git-diff-tree failed