Merge branch 'batman-adv/maint' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Thu, 20 Oct 2011 21:40:43 +0000 (17:40 -0400)
committerDavid S. Miller <davem@davemloft.net>
Thu, 20 Oct 2011 21:40:43 +0000 (17:40 -0400)
commit580043a27da2bd8201ee321a0d5550c629fcab8d
tree382880dcf5ff869d270ec0c2ef979475bf48cf5e
parent113ab386c7d6625cff284fb10952ff69a58c18a4
parent9d8523931f7f5eb8900077f0da0fbe6b8ad0010b
Merge branch 'batman-adv/maint' of git://git.open-mesh.org/linux-merge