tree 991cd2aff1ec1b74d1e3c658eb2ea09b0f93e5bd
parent 994635a137f637466d36a7c6272dae014a46a11c
parent 44c4349a2a117b22a5c4087f2ac9faf10c575e17
author David S. Miller <davem@davemloft.net> 1309920312 -0700
committer David S. Miller <davem@davemloft.net> 1309920312 -0700

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