git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
278bc42
)
batman-adv: Fix merge error.
author
David S. Miller
<davem@davemloft.net>
Fri, 16 Dec 2011 20:07:28 +0000
(15:07 -0500)
committer
David S. Miller
<davem@davemloft.net>
Fri, 16 Dec 2011 20:07:28 +0000
(15:07 -0500)
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 <davem@davemloft.net>
No differences found