From: Johannes Berg <johannes.berg@intel.com>
Date: Tue, 12 Feb 2013 15:52:04 +0000 (+0100)
Subject: Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next
X-Git-Tag: Ubuntu-5.10.0-12.13~19721^2~2^2^2~25
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=94d2f0ba052150a6d7217aeb836f5a709d1cadda;p=mirror_ubuntu-hirsute-kernel.git

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

94d2f0ba052150a6d7217aeb836f5a709d1cadda