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: v3.10-rc2~34^2~21^2^2~17^2~84
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=41effc2a6c6548f1dc6b749f09c646d931c309a4;p=platform%2Fupstream%2Fkernel-adaptation-pc.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