From: David S. Miller <davem@davemloft.net>
Date: Mon, 18 Apr 2011 00:37:29 +0000 (-0700)
Subject: Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=9c6bc16577171100e5efab0ea09ebf5884822ed6;p=deliverable%2Flinux.git

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

9c6bc16577171100e5efab0ea09ebf5884822ed6