| commit | adda306744ec64c7bcd6c230a6bc060fb77bd7c3 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Sat Nov 19 11:11:52 2016 -0500 |
| committer | David S. Miller <davem@davemloft.net> | Sat Nov 19 11:11:52 2016 -0500 |
| tree | a9c4722291c9af0cb3e1a58474fdc6f37cc5554f | |
| parent | 178c7ae944444c198a1d9646477ab10d2d51f03e [diff] | |
| parent | e13258f38e927b61cdb5f4ad25309450d3b127d1 [diff] |
Merge tag 'batadv-net-for-davem-20161119' of git://git.open-mesh.org/linux-merge Simon Wunderlich says: ==================== Here are two batman-adv bugfix patches: - Revert a splat on disabling interface which created another problem, by Sven Eckelmann - Fix error handling when the primary interface disappears during a throughput meter test, by Sven Eckelmann ==================== Signed-off-by: David S. Miller <davem@davemloft.net>