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/netdev/net

Browse source 
Several cases of overlapping changes which were for the most
part trivially resolvable.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2019-10-19 22:51:25 -07:00
commit 2f184393e0
730 changed files with 6527 additions and 6534 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/uapi/linux/serial_core.h
View file

@ -291,6 +291,6 @@
#define PORT_SUNIX 121
/* Freescale Linflex UART */
#define PORT_LINFLEXUART 121
#define PORT_LINFLEXUART 122
#endif /* _UAPILINUX_SERIAL_CORE_H */