tree 2917993c44af42e335533b1018b35c17b3747132
parent 3ddb709af32bacaf78d124420404d1ac19be99b8
parent 93840ac40bb0d0f177ef8af74e64671be67e8c37
author David S. Miller <davem@davemloft.net> 1319958307 -0400
committer David S. Miller <davem@davemloft.net> 1319958307 -0400

Merge branch 'batman-adv/maint' of git://git.open-mesh.org/linux-merge