From: David S. Miller Date: Fri, 16 Dec 2011 20:07:28 +0000 (-0500) Subject: batman-adv: Fix merge error. X-Git-Tag: v3.3-rc1~182^2~190 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=220b07e90e3b7b3adc60b8a72c79ad4465312072;p=pandora-kernel.git batman-adv: Fix merge error. I didn't resolve the merge properly during the last pull of the net tree into net-next. The code in the final resolution should set flags to TT_CLIENT_ROAM not TT_CLIENT_PENDING. Signed-off-by: David S. Miller --- Reading git-diff-tree failed