Merge branch 'batman-adv/next' of git://git.open-mesh.org/linux-merge
commitc7c6575f254e5621a8408c29bdab0d704c3fab6e
authorDavid S. Miller <davem@davemloft.net>
Tue, 13 Dec 2011 00:26:07 +0000 (12 19:26 -0500)
committerDavid S. Miller <davem@davemloft.net>
Tue, 13 Dec 2011 00:26:07 +0000 (12 19:26 -0500)
treed0b399a480a8633be6373c035f6253e1a40987af
parent0850f0f5c54261a6236f013e8bac154bcce424d6
parentb5a1eeef04cc7859f34dec9b72ea1b28e4aba07c
Merge branch 'batman-adv/next' of git://git.open-mesh.org/linux-merge