aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/unifdef.c
diff options
context:
space:
mode:
authorDavid S. Miller <[email protected]>2011-12-16 20:07:28 +0000
committerDavid S. Miller <[email protected]>2011-12-16 20:07:28 +0000
commit220b07e90e3b7b3adc60b8a72c79ad4465312072 (patch)
tree06421abf3e8976395e37f2d42ae4c2e0f6662ec8 /scripts/unifdef.c
parentethtool: Define and apply a default policy for RX flow hash indirection (diff)
downloadkernel-220b07e90e3b7b3adc60b8a72c79ad4465312072.tar.gz
kernel-220b07e90e3b7b3adc60b8a72c79ad4465312072.zip
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 <[email protected]>
Diffstat (limited to 'scripts/unifdef.c')
0 files changed, 0 insertions, 0 deletions