From: David S. Miller <davem@davemloft.net>
Date: Thu, 29 Aug 2013 05:44:24 +0000 (-0400)
Subject: Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
X-Git-Tag: v3.12-rc1~132^2~163
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cc328deac5a5f576aa79d87cfacf01e370e5e03e;p=kernel%2Fkernel-generic.git

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>
---

cc328deac5a5f576aa79d87cfacf01e370e5e03e