On Tue, 2016-03-01 at 17:11 -0500, David Miller wrote:
>
> There was a minor merge conflict with net/mac80211/debugfs.c, take
> a look and send me any fixups necessary.
>
Ah yes, I'd wondered when that change was coming in, but missed that
you had it in net-next now.
Looks good, thanks!
johann
From: Johannes Berg
Date: Fri, 26 Feb 2016 21:37:46 +0100
> Let's try this again. I backed out some of the rfkill changes
> that are buggy and fixed some of that too. I also left out the
> one that generated the big discussion, but I still think it's
> the saner thing to do rather than requiring
