projects / cascardo / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 80b17be c6eaa3f)
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)
commitcc328deac5a5f576aa79d87cfacf01e370e5e03e
tree871b1944559e851356928350229aeafca26a166ftree | snapshot
parent80b17be70b63646cb141bf1826afe32281e561eccommit | diff
parentc6eaa3f067d6f9fa55fd9645e93ed79411bebdafcommit | diff
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>
Unnamed repository; edit this file 'description' to name the repository.