From mboxrd@z Thu Jan  1 00:00:00 1970
From: David Miller <davem@davemloft.net>
Subject: Re: pull-request: mac80211-next 2015-01-15
Date: Thu, 15 Jan 2015 19:28:20 -0500 (EST)
Message-ID: <20150115.192820.2095761147762961625.davem@davemloft.net>
References: <1421325902.1962.8.camel@sipsolutions.net>
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Cc: netdev@vger.kernel.org, linux-wireless@vger.kernel.org
To: johannes@sipsolutions.net
Return-path: <netdev-owner@vger.kernel.org>
Received: from shards.monkeyblade.net ([149.20.54.216]:56026 "EHLO
	shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1752269AbbAPA2V (ORCPT
	<rfc822;netdev@vger.kernel.org>); Thu, 15 Jan 2015 19:28:21 -0500
In-Reply-To: <1421325902.1962.8.camel@sipsolutions.net>
Sender: netdev-owner@vger.kernel.org
List-ID: <netdev.vger.kernel.org>

From: Johannes Berg <johannes@sipsolutions.net>
Date: Thu, 15 Jan 2015 13:45:02 +0100

> My first pull request for -next, sorry I dragged my feet on this.
> 
> I merged mac80211.git to avoid some conflicts, but the content was in
> net-next already anyway.
> 
> Let me know if there's any issue or any format changes you'd like to make.

I had to resolve a minor merge conflict, please take a look to make sure
I got it right.

Pulled, thanks.