Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Thu, 30 May 2013 22:53:18 +0000 (15:53 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 30 May 2013 22:53:18 +0000 (15:53 -0700)
commita230e033845853ebcfd21aae7a019a5392ebd30e
tree0a9c5cb054513d4c0cc08aa1f3c80102546a3241
parentcbb963deed7bbf206f5077ab5742bee00ceefa46
parent6715fd3f0538e805b6a769d66823ec16b8b647ac
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>