From: Antonio Quartulli antonio@meshcoding.com Date: Wed, 9 Oct 2013 21:32:38 +0200
here you have my fixed pull request intended for net-next.
The previous build error was due to an accidental remotion of the beginning of a batadv_dbg() statement during a merge conflict resolution. Sorry for that.
This looks better, pulled, thanks a lot.