From: David S. Miller <davem@davemloft.net>
Date: Fri, 1 Jul 2016 21:05:00 +0000 (-0400)
Subject: Merge tag 'batadv-next-for-davem-20160701' of git://git.open-mesh.org/linux-merge
X-Git-Tag: v4.8-rc1~140^2~209
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=3ea00443f1b17405ce9e1421bb7706777339926e;p=linux.git

Merge tag 'batadv-next-for-davem-20160701' of git://git.open-mesh.org/linux-merge

Simon Wunderlich says:

====================
This feature patchset includes the following changes:

 - two patches with minimal clean up work by Antonio Quartulli and
   Simon Wunderlich

 - eight patches of B.A.T.M.A.N. V, API and documentation clean
   up work, by Antonio Quartulli and Marek Lindner

 - Andrew Lunn fixed the skb priority adoption when forwarding
   fragmented packets (two patches)

 - Multicast optimization support is now enabled for bridges which
   comes with some protocol updates, by Linus Luessing
====================

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

3ea00443f1b17405ce9e1421bb7706777339926e