linux/include/uapi
David S. Miller dc25b25897 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/usb/qmi_wwan.c

Overlapping additions of new device IDs to qmi_wwan.c

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-08-21 11:44:04 -07:00
..
asm-generic
drm
linux Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next 2015-08-20 22:18:45 -07:00
misc
mtd
rdma
scsi
sound ASoC: Disable topology support for v4.2 2015-08-19 18:31:54 +02:00
video
xen
Kbuild