(off-list ancestor, not in this archive)
Re: pull request: batman-adv 2012-06-25 · David Miller <hidden> · 2012-06-25
[PATCH 0/2 net-next]: fixups for wrong conflict resolution · Antonio Quartulli <hidden> · 2012-06-26
[PATCH 2/2 net-next] batman-adv: fix global TT entry deletion · Antonio Quartulli <hidden> · 2012-06-26
Re: [PATCH 0/2 net-next]: fixups for wrong conflict resolution · David Miller <davem@davemloft.net> · 2012-06-26

Re: [PATCH 0/2 net-next]: fixups for wrong conflict resolution

From: David Miller <davem@davemloft.net>
Date: 2012-06-26 06:55:23
Also in: batman

From: Antonio Quartulli <redacted>
Date: Tue, 26 Jun 2012 08:49:49 +0200

here are our two fixes to recover from the little problems introduced during the
last conflict resolution involving translation-table.c.
Sorry for the inconvenient.

Both applied, thanks.

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help