22115ab13209862ffdf35c11c9f7923a059188c
parent bb092c0db883d435d9d774e10b4cf71f12aad122
parent 40e0c4f51d3fc3fd54edc797adae314fbe2b96a6
author David S. Miller <davem@davemloft.net> 1331505394 -0700
committer David S. Miller <davem@davemloft.net> 1331505394 -0700

Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
éÃi4—