From: David S. Miller <davem@davemloft.net>
Date: Thu, 30 May 2013 22:53:18 +0000 (-0700)
Subject: Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
X-Git-Tag: v3.11-rc1~16^2~267
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a230e033845853ebcfd21aae7a019a5392ebd30e;p=profile%2Fivi%2Fkernel-x86-ivi.git

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

Included changes:
- reduce broadcast overhead on non-lossy wired links
- fix typos in kernel doc
- use eth_hdr() when possible
- use netdev_allock_skb_ip_align() and don't deal with NET_IP_ALIGN
- change VID semantic in the BLA component
- other minor cleanups and code refactoring

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

a230e033845853ebcfd21aae7a019a5392ebd30e