tree 41cdc85827cb6731e993e254208538eb42147886
parent 03746b0a02d25866a29cd8d7306d221c238d6397
parent af20b710479ae662829cf739b521390daa7fcbcb
author David S. Miller <davem@davemloft.net> 1303087049 -0700
committer David S. Miller <davem@davemloft.net> 1303087049 -0700

Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge