linux-xiaomi-chiron/include/uapi
David S. Miller 13dfb3fa49 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Just minor overlapping changes in the conflicts here.

Signed-off-by: David S. Miller <davem@davemloft.net>
2019-08-06 18:44:57 -07:00
..
asm-generic
drm
linux
misc
mtd
rdma
scsi
sound
video
xen
Kbuild