tree d0b399a480a8633be6373c035f6253e1a40987af
parent 0850f0f5c54261a6236f013e8bac154bcce424d6
parent b5a1eeef04cc7859f34dec9b72ea1b28e4aba07c
author David S. Miller <davem@davemloft.net> 1323735967 -0500
committer David S. Miller <davem@davemloft.net> 1323735967 -0500

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