Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Thu, 29 Aug 2013 05:44:24 +0000 (01:44 -0400)
committerDavid S. Miller <davem@davemloft.net>
Thu, 29 Aug 2013 05:44:24 +0000 (01:44 -0400)
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>

Trivial merge