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

Two easy cases of overlapping changes.

David S. Miller committed 7 years ago

Commit 8b448362 parents c049d56 cd8dead247 files · +1881 −715Browse files

Showing the changes to tools/include/uapi (1 of 247 files). Show all

Unified · Split

tools/include/uapi/sound/asound.h+1−0

@@ -32,6 +32,7 @@ · 31 unmodified lines
32		32
33	#ifndef __KERNEL__	33	#ifndef __KERNEL__
34	#include <stdlib.h>	34	#include <stdlib.h>
		35	#include <time.h>
35	#endif	36	#endif
36		37
37	/*	38	/*