From mboxrd@z Thu Jan  1 00:00:00 1970
From: David Miller <davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
Subject: Re: pull-request: mac80211-next 2016-10-04
Date: Tue, 04 Oct 2016 20:25:28 -0400 (EDT)
Message-ID: <20161004.202528.768645047812953671.davem@davemloft.net>
References: <1475567338-28291-1-git-send-email-johannes@sipsolutions.net>
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Cc: netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
To: johannes-cdvu00un1VgdHxzADdlk8Q@public.gmane.org
Return-path: <linux-wireless-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>
In-Reply-To: <1475567338-28291-1-git-send-email-johannes-cdvu00un1VgdHxzADdlk8Q@public.gmane.org>
Sender: linux-wireless-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
List-Id: netdev.vger.kernel.org

From: Johannes Berg <johannes-cdvu00un1VgdHxzADdlk8Q@public.gmane.org>
Date: Tue,  4 Oct 2016 09:31:28 +0200

> Here's a version with the conflicts resolved - had to jigger some
> code around, but it's all described in the merge commit message.
> 
> Let me know if there's any problem.

Pulled, thanks for resolving this.