Merge branch 'batman-adv/maint' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Sun, 30 Oct 2011 07:05:07 +0000 (03:05 -0400)
committerDavid S. Miller <davem@davemloft.net>
Sun, 30 Oct 2011 07:05:07 +0000 (03:05 -0400)
commit9eeebb5bc8d984298cba9d12690923cdc09ab173
tree2917993c44af42e335533b1018b35c17b3747132
parent3ddb709af32bacaf78d124420404d1ac19be99b8
parent93840ac40bb0d0f177ef8af74e64671be67e8c37
Merge branch 'batman-adv/maint' of git://git.open-mesh.org/linux-merge
net/batman-adv/translation-table.c
net/batman-adv/types.h