kybaaz/linux-xiaomi-chiron
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Conflict resolution of af_smc.c from Stephen Rothwell.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2019-04-17 11:26:25 -07:00
commit 6b0a7f84ea
350 changed files with 3837 additions and 1907 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/uapi/sound/asound.h
View file

@ -32,6 +32,7 @@
#ifndef __KERNEL__
#include <stdlib.h>
#include <time.h>
#endif
/*