projects / linux-2.6-microblaze.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 178c7ae e13258f)
Merge tag 'batadv-net-for-davem-20161119' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Sat, 19 Nov 2016 16:11:52 +0000 (11:11 -0500)
committerDavid S. Miller <davem@davemloft.net>
Sat, 19 Nov 2016 16:11:52 +0000 (11:11 -0500)
commitadda306744ec64c7bcd6c230a6bc060fb77bd7c3
treea9c4722291c9af0cb3e1a58474fdc6f37cc5554ftree | snapshot
parent178c7ae944444c198a1d9646477ab10d2d51f03ecommit | diff
parente13258f38e927b61cdb5f4ad25309450d3b127d1commit | 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>
MicroBlaze GIT Repository