Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Two easy cases of overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>
2019-04-25 23:52:29 -04:00
parent c049d56eb2 cd8dead0c3
commit 8b44836583
247 changed files with 1884 additions and 718 deletions
--- a/tools/include/uapi/sound/asound.h
+++ b/tools/include/uapi/sound/asound.h
@@ -32,6 +32,7 @@

 #ifndef __KERNEL__
 #include <stdlib.h>
+#include <time.h>
 #endif

 /*