linux/include/uapi
Johannes Berg 188de5dd80 Merge remote-tracking branch 'net-next/master' into mac80211-next
Merge net-next, which pulled in net, so I can merge a few more
patches that would otherwise conflict.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2018-10-08 09:48:36 +02:00
..
asm-generic mm/hugetlb: add mmap() encodings for 32MB and 512MB page sizes 2018-10-05 16:32:04 -07:00
drm
linux Merge remote-tracking branch 'net-next/master' into mac80211-next 2018-10-08 09:48:36 +02:00
misc
mtd
rdma
scsi
sound
video
xen