From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <greg@kroah.com>
Date: Tue, 11 May 2010 13:47:48 -0700
From: Greg KH <greg@kroah.com>
Message-ID: <20100511204748.GA12704@kroah.com>
References: <201005072243.12054.lindner_marek@yahoo.de>
	<20100507152606.GA18943@kroah.com>
	<y2x506b70dc1005071041zb0659d46n73f4faf14625ec41@mail.gmail.com>
	<20100507175607.GA3734@lunn.ch>
	<g2t506b70dc1005071154q6764e0bapdc4f8a3a48b4d3d4@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="iso-8859-1"
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
In-Reply-To: <g2t506b70dc1005071154q6764e0bapdc4f8a3a48b4d3d4@mail.gmail.com>
Subject: Re: [B.A.T.M.A.N.] batman patch authorship mangled
Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking
	<b.a.t.m.a.n@lists.open-mesh.org>
List-Id: The list for a Better Approach To Mobile Ad-hoc Networking
	<b.a.t.m.a.n.lists.open-mesh.org>
List-Unsubscribe: <https://lists.open-mesh.org/mm/options/b.a.t.m.a.n>,
	<mailto:b.a.t.m.a.n-request@lists.open-mesh.org?subject=unsubscribe>
List-Archive: <http://lists.open-mesh.org/pipermail/b.a.t.m.a.n>
List-Post: <mailto:b.a.t.m.a.n@lists.open-mesh.org>
List-Help: <mailto:b.a.t.m.a.n-request@lists.open-mesh.org?subject=help>
List-Subscribe: <https://lists.open-mesh.org/mm/listinfo/b.a.t.m.a.n>,
	<mailto:b.a.t.m.a.n-request@lists.open-mesh.org?subject=subscribe>
To: Luis de Bethencourt <luisbg@ubuntu.com>
Cc: b.a.t.m.a.n@lists.open-mesh.net, "devel@linuxdriverproject.org" <devel@linuxdriverproject.org>, Marek Lindner <lindner_marek@yahoo.de>

On Fri, May 07, 2010 at 07:54:36PM +0100, Luis de Bethencourt wrote:
> On Fri, May 7, 2010 at 6:56 PM, Andrew Lunn <andrew@lunn.ch> wrote:
> >> Greg, wait!
> >>
> >> No need for this. I understand the problem, can imagine why it
> >> happened and I don't mind the wrong authorship. I prefer avoiding the
> >> general head-ache of rebasing the whole tree.
> >>
> >> To be honest I noticed this in yesterday's emails but I decided to not
> >> mention it.
> >>
> >> Marek,
> >> Any beers for me then :P
> >
> > So, i will wait until somebody has time to visit the post office and
> > work out which is cheaper: Beer to Greg, or Beer to Luis.
> >
> > =A0 =A0 Andrew
> >
>=20
> Make it for Greg :)

Ok, I've rebased the staging-next tree on 2.6.34-rc6, reapplied the
patches, and then took your 26 patches and applied them and pushed
everything out.

Can someone verify that I got it all correct?

Oh, and you owe me one bottle of "Tactical Nuclear Penguin" :)

thanks,

greg k-h