Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Mon, 20 Jun 2011 19:59:37 +0000 (12:59 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 20 Jun 2011 19:59:37 +0000 (12:59 -0700)
commiteac56465b88cc9ad3b964a9f0a02be3d3a136ddf
tree63550c9f343f6c9351f0b54be8664807e97abb93
parent1b9c4134c126aa8ae00a57672d4a4eaecc436b54
parent43676ab590c3f8686fd047d34c3e33803eef71f0
Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge
net/batman-adv/hard-interface.c