tree 382880dcf5ff869d270ec0c2ef979475bf48cf5e
parent 113ab386c7d6625cff284fb10952ff69a58c18a4
parent 9d8523931f7f5eb8900077f0da0fbe6b8ad0010b
author David S. Miller <davem@davemloft.net> 1319146843 -0400
committer David S. Miller <davem@davemloft.net> 1319146843 -0400

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