summaryrefslogtreecommitdiff
path: root/net/ethernet
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2017-01-30 03:21:26 +0300
committerDavid S. Miller <davem@davemloft.net>2017-01-30 03:21:26 +0300
commit936f459bea07868723b057ece43d321446c82f0a (patch)
tree45b3174a471b105139d56fc7f6814f3b50bb4901 /net/ethernet
parent678550c651aee051d66112933c87894f129b9355 (diff)
parent3e7514afc7d728dd47c5fe9d7a1f5216fe659cda (diff)
downloadlinux-936f459bea07868723b057ece43d321446c82f0a.tar.xz
Merge tag 'batadv-next-for-davem-20170128' of git://git.open-mesh.org/linux-merge
Simon Wunderlich says: ==================== Here are two fixes for batman-adv for net-next: - fix double call of dev_queue_xmit(), caused by the recent introduction of net_xmit_eval(), by Sven Eckelmann - Fix includes for IS_ERR/ERR_PTR, by Sven Eckelmann ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ethernet')
0 files changed, 0 insertions, 0 deletions