]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c06f55a e660abc)
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)
commitccb5be61fc12dbe741ca290d62392a0073b5b832
tree871b1944559e851356928350229aeafca26a166ftree | snapshot
parentc06f55ad061f1e4a93e9d57bf91bd053b9f37e29commit | diff
parente660abc2e453b164fec3f3c1f904b29c4560fd58commit | 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>
Linux Kernel Source Tree.