Commits

Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge Included changes: - set the protocol field in the skb structure according to the encapsulated payload - make the gateway component send a uevent in case of "gw client mode" de-selection - increment version number - minor code rearrangement Signed-off-by: David S. Miller <davem@davemloft.net>