linux/include/uapi
David S. Miller 53af53ae83 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	include/linux/netdevice.h
	net/core/sock.c

Trivial merge issues.

Removal of "extern" for functions declaration in netdevice.h
at the same time "const" was added to an argument.

Two parallel line additions in net/core/sock.c

Signed-off-by: David S. Miller <davem@davemloft.net>
2013-10-08 23:07:53 -04:00
..
asm-generic net: introduce SO_MAX_PACING_RATE 2013-09-28 15:35:41 -07:00
drm drm/radeon/cik: Add tiling mode index for 1D tiled depth/stencil surfaces 2013-09-20 17:33:40 -04:00
linux Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-10-08 23:07:53 -04:00
mtd UBI: document UBI_IOCVOLUP better in user header 2013-05-29 15:19:26 +03:00
rdma IB/core: Export ib_create/destroy_flow through uverbs 2013-08-28 09:53:14 -07:00
scsi FCoE Updates for 3.9 2013-03-01 09:10:08 +00:00
sound ALSA: hdspm - Fix SNDRV_HDSPM_IOCTL_GET_LTC 2013-08-19 20:09:09 +02:00
video UAPI: (Scripted) Disintegrate include/video 2012-12-20 17:14:26 +00:00
xen
Kbuild