aboutsummaryrefslogtreecommitdiff
path: root/net/tipc/discover.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-10-30 03:05:07 -0400
committerDavid S. Miller <davem@davemloft.net>2011-10-30 03:05:07 -0400
commit9eeebb5bc8d984298cba9d12690923cdc09ab173 (patch)
tree2917993c44af42e335533b1018b35c17b3747132 /net/tipc/discover.c
parent3ddb709af32bacaf78d124420404d1ac19be99b8 (diff)
parent93840ac40bb0d0f177ef8af74e64671be67e8c37 (diff)
Merge branch 'batman-adv/maint' of git://git.open-mesh.org/linux-merge
Diffstat (limited to 'net/tipc/discover.c')
0 files changed, 0 insertions, 0 deletions