From mboxrd@z Thu Jan  1 00:00:00 1970
From: Linus Torvalds <torvalds@linux-foundation.org>
Subject: Re: [GIT] Networking
Date: Tue, 25 Oct 2011 15:12:46 +0200
Message-ID: <CA+55aFyVdz5Fcksr5=krkcy6WDVVFD75yKq4h3GJYBq411nt-g@mail.gmail.com>
References: <20111025.063206.2273357152859701628.davem@davemloft.net>
 <CA+55aFw1GVvszqoC_f0RAvG5t1xj0CSYLhLU=y0gQ+_54Gsomw@mail.gmail.com> <m1wrbtb4rj.fsf@fess.ebiederm.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: QUOTED-PRINTABLE
Cc: David Miller <davem@davemloft.net>, Greg KH <gregkh@suse.de>,
	Mikulas Patocka <mpatocka@redhat.com>,
	akpm@linux-foundation.org, netdev@vger.kernel.org,
	linux-kernel@vger.kernel.org
To: "Eric W. Biederman" <ebiederm@xmission.com>
Return-path: <linux-kernel-owner@vger.kernel.org>
In-Reply-To: <m1wrbtb4rj.fsf@fess.ebiederm.org>
Sender: linux-kernel-owner@vger.kernel.org
List-Id: netdev.vger.kernel.org

On Tue, Oct 25, 2011 at 3:05 PM, Eric W. Biederman
<ebiederm@xmission.com> wrote:
>
> The meat of my change seems to have gotten lost in the conflict
> resolution. =A0Fixes 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