linux/include/uapi
David S. Miller c99f7abf0e Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	include/net/inetpeer.h
	net/ipv6/output_core.c

Changes in net were fixing bugs in code removed in net-next.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-06-03 23:32:12 -07:00
..
asm-generic asm-generic: Add renameat2 syscall 2014-05-20 10:59:38 +02:00
drm drm/tegra: Remove gratuitous pad field 2014-04-16 17:11:04 +02:00
linux Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-06-03 23:32:12 -07:00
mtd UBI: make UBI_IOCVOLCRBLK take a parameter for future usage 2014-03-06 12:04:22 +02:00
rdma IB/core: Re-enable create_flow/destroy_flow uverbs 2013-11-17 08:22:09 -08:00
scsi
sound ALSA: compress: add num_sample_rates in snd_codec_desc 2014-01-07 18:33:40 +01:00
video
xen xen: install xen/gntdev.h and xen/gntalloc.h 2014-02-11 10:12:36 -05:00
Kbuild