Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Thu, 9 Jun 2011 21:56:13 +0000 (14:56 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 9 Jun 2011 21:56:13 +0000 (14:56 -0700)
commit6018e1183ba52735d47e8c183497d8598da75351
tree3e9be6d850e292274ff05744ce36431492b975c7
parent075cd29e307720dfde5b67d1715a102473bf4623
parentecbd532108cb21d9d3770f73e168bad65d14d9eb
Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge
net/batman-adv/hard-interface.c