Repository : ssh://git@open-mesh.org/batman-adv
On branch : master
---------------------------------------------------------------
commit 77ddf971a187eb4bec84c9f08793ff4460a38851
Merge: d7c9a9e 3515604
Author: Marek Lindner <mareklindner(a)neomailbox.ch>
Date: Mon Feb 29 10:23:50 2016 +0800
Merge branch 'next'
---------------------------------------------------------------
77ddf971a187eb4bec84c9f08793ff4460a38851
compat-include/linux/ethtool.h | 62 ++++++++++++++++++++++++++++++++++++++++++
net/batman-adv/bat_v_elp.c | 12 ++++----
2 files changed, 68 insertions(+), 6 deletions(-)