Re: [PATCH net] Bug fix for batman-adv 2012-07-06

From: Antonio Quartulli <redacted>
Date: Fri, 6 Jul 2012 00:51:40 +0200

here you have our instructions to resolve the conflicts that you will hit while
merging net into net-next:

Thanks for this.