tree bb98f2977e03bd2d4812ec5442e6cfb0e7678721
parent dcf96f1ff66f328fecf1e14437ac73db71b08c03
parent 3878f1f075470990d9c2418b53f31694e774f743
author David S. Miller <davem@davemloft.net> 1297488027 -0800
committer David S. Miller <davem@davemloft.net> 1297488027 -0800

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