Re: [GIT] Networking

[Linus Torvalds]

On Tue, Oct 25, 2011 at 3:05 PM, Eric W. Biederman
<ebiederm@xxxxxxxxxxxx> wrote:
>
> The meat of my change seems to have gotten lost in the conflict
> resolution.  Fixes in the patch below.

Duh. I was thinking about that when doing the merge, but then never
did the fixups. My bad.

Thanks, applied,

                Linus
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/