Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Mon, 18 Apr 2011 00:37:29 +0000 (17:37 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 18 Apr 2011 00:37:29 +0000 (17:37 -0700)
commit9c6bc16577171100e5efab0ea09ebf5884822ed6
tree41cdc85827cb6731e993e254208538eb42147886
parent03746b0a02d25866a29cd8d7306d221c238d6397
parentaf20b710479ae662829cf739b521390daa7fcbcb
Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge
net/batman-adv/soft-interface.c