diff options
| author | David S. Miller <davem@davemloft.net> | 2016-11-19 11:11:52 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-11-19 11:11:52 -0500 |
| commit | adda306744ec64c7bcd6c230a6bc060fb77bd7c3 (patch) | |
| tree | a9c4722291c9af0cb3e1a58474fdc6f37cc5554f /net/key | |
| parent | 178c7ae944444c198a1d9646477ab10d2d51f03e (diff) | |
| parent | e13258f38e927b61cdb5f4ad25309450d3b127d1 (diff) | |
| download | talos-obmc-linux-adda306744ec64c7bcd6c230a6bc060fb77bd7c3.tar.gz talos-obmc-linux-adda306744ec64c7bcd6c230a6bc060fb77bd7c3.zip | |
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>
Diffstat (limited to 'net/key')
0 files changed, 0 insertions, 0 deletions
