Merge branch 'batman-adv/maint' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Wed, 7 Dec 2011 20:06:33 +0000 (15:06 -0500)
committerDavid S. Miller <davem@davemloft.net>
Wed, 7 Dec 2011 20:06:33 +0000 (15:06 -0500)
commit1af32f0fcf33ddca52c8fd2b5bc84c129dcb1bdd
treef749fbe49714be639e4c9579178f9ae0adf4a7de
parent28d8ea2d568534026ccda3e8936f5ea1e04a86a1
parent797399b415b78dacdbcaffdb89e46e369ec88b98
Merge branch 'batman-adv/maint' of git://git.open-mesh.org/linux-merge