mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-08 10:35:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

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
parent ebcd670d05 531e93d114
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 */