From: David S. Miller <davem@davemloft.net>
Date: Fri, 30 Nov 2012 17:22:04 +0000 (-0500)
Subject: Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
X-Git-Tag: v3.12-rc1~1806^2~159
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dad52fd964c54aa275ebb5c935ef8d8b0eded74d;p=kernel%2Fkernel-generic.git

Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge

Included changes:
- Use the new ETH_P_BATMAN define instead of the private BATADV_ETH_P_BATMAN

Signed-off-by: David S. Miller <davem@davemloft.net>
---

dad52fd964c54aa275ebb5c935ef8d8b0eded74d