Subject: Re: pull-request: mac80211-next 2015-05-29

From: Johannes Berg <[email-masked]>
Date: Mon, 01 Jun 2015 09:11:38 +0200

On Sun, 2015-05-31 at 17:35 -0700, David Miller wrote:
> Pulled, but there was a small conflict in include/net/mac80211.h which seemed
> trivially resolvable.  Take a look and send me a fixup if I got it wrong,
> thanks.

Looks good - it seems I managed to apply two different docbook fixes to
the two different trees ... Talk about being confused :)

johannes