tree 8a60386e7e55c44fc08c02506380989a3c83a166
parent 5615787257742aab42ecf17c11e3244d9536a48d
parent 32ae9b221e788413ce68feaae2ca39e406211a0a
author David S. Miller <davem@davemloft.net> 1304373886 -0700
committer David S. Miller <davem@davemloft.net> 1304373886 -0700

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