Merge branch 'batman-adv/next' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Wed, 24 Aug 2011 17:33:00 +0000 (10:33 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 24 Aug 2011 17:33:00 +0000 (10:33 -0700)
commit0e43182c0c9482a26a4108da9254f3e2869a8e18
tree4631b42bebca8dd9bca61e167e543aabd3b981a7
parent131ea6675c761f655d43b808dd0fe83d15d5cdd3
parenta943cac144e035c21d4f1b31b95f15b33c33a480
Merge branch 'batman-adv/next' of git://git.open-mesh.org/linux-merge