From: Johannes Berg <johannes.berg@intel.com>
Date: Wed, 6 Mar 2013 15:46:25 +0000 (+0100)
Subject: Merge remote-tracking branch 'iwlwifi-fixes/master' into HEAD
X-Git-Tag: omap-for-v3.10/dt-fixes-for-merge-window~65^2~390^2^2~68^2~31
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=41effc2a6c6548f1dc6b749f09c646d931c309a4;p=pandora-kernel.git

Merge remote-tracking branch 'iwlwifi-fixes/master' into HEAD

This is needed to resolve some conflicts that would otherwise
happen between wireless-next and the code here.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---

41effc2a6c6548f1dc6b749f09c646d931c309a4
Reading git-diff-tree failed