From: Reinette Chatre <reinette.chatre@intel.com>
Date: Fri, 25 Jun 2010 21:47:02 +0000 (-0700)
Subject: Merge branch 'wireless-2.6' into wireless-next-2.6
X-Git-Tag: v2.6.36-rc1~571^2~385^2~42
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e691e19e05c2cef72cd7f81bcae4195c81d4bf51;p=pandora-kernel.git

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

e691e19e05c2cef72cd7f81bcae4195c81d4bf51
Reading git-diff-tree failed