remarkable-linux/include/uapi
David S. Miller c3fa32b976 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/usb/qmi_wwan.c
	include/net/dst.h

Trivial merge conflicts, both were overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2013-10-23 16:49:34 -04:00
..
asm-generic net: introduce SO_MAX_PACING_RATE 2013-09-28 15:35:41 -07:00
drm drm: Pad drm_mode_get_connector to 64-bit boundary 2013-10-18 07:42:23 +01:00
linux bonding: add Netlink support active_slave option 2013-10-19 18:58:46 -04:00
mtd UBI: document UBI_IOCVOLUP better in user header 2013-05-29 15:19:26 +03:00
rdma IB/core: Temporarily disable create_flow/destroy_flow uverbs 2013-10-21 09:44:17 -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