Re: pull-request: mac80211-next 2015-01-15

On Thu, 2015-01-15 at 19:28 -0500, David Miller wrote:

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

Ah, yes, sorry about that - I knew about the conflict (had resolved it
numerous times) but forgot to give you a heads-up.

What you did is good, thanks.

johannes


--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html