linux/tools/include/uapi
David S. Miller 4dc6758d78 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Simple cases of overlapping changes in the packet scheduler.

Must easier to resolve this time.

Which probably means that I screwed it up somehow.

Signed-off-by: David S. Miller <davem@davemloft.net>
2017-11-10 10:00:18 +09:00
..
asm-generic tools/headers: Synchronize kernel ABI headers 2017-11-04 09:27:46 +01:00
drm tools include: Sync kernel ABI headers with tooling headers 2017-09-25 10:39:44 -03:00
linux Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2017-11-10 10:00:18 +09:00
sound tools/headers: Synchronize kernel ABI headers 2017-11-04 09:27:46 +01:00