From: Johannes Berg <johannes.berg@intel.com>
Date: Tue, 4 Jun 2013 10:56:01 +0000 (+0200)
Subject: Merge remote-tracking branch 'wireless-next/master' into HEAD
X-Git-Tag: v3.11-rc1~64^2~166^2^2~45^2~19
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=51217cee3a94d5409d6ee2ac090ae96bc9a06757;p=pandora-kernel.git

Merge remote-tracking branch 'wireless-next/master' into HEAD

Merge to get the wil6210 changes that a cfg80211 change needs.
A conflict in drivers/net/wireless/ath/ath9k/init.c was just
whitespace changes.

Also fix a semantic conflict due to cw1200 using WoWLAN which
I had modified in my tree.

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

51217cee3a94d5409d6ee2ac090ae96bc9a06757
Reading git-diff-tree failed