Merge branch 'batman-adv/next' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Wed, 21 Sep 2011 19:25:47 +0000 (15:25 -0400)
committerDavid S. Miller <davem@davemloft.net>
Wed, 21 Sep 2011 19:25:47 +0000 (15:25 -0400)
commit0c070900f64ef37daf198eea5ef778eb8dba5020
treeb31a54fff10f28333daeca0d86d74bb3201110e6
parentf26cd41ae56f3c0ef4521505ad5b6e3940849c33
parent320f422f629c7ed5d07b4186aa491d1e11d18a4c
Merge branch 'batman-adv/next' of git://git.open-mesh.org/linux-merge