David S. Miller 4fbef95af4 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/emulex/benet/be.h drivers/net/usb/qmi_wwan.c drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h include/net/netfilter/nf_conntrack_synproxy.h include/net/secure_seq.h The conflicts are of two varieties: 1) Conflicts with Joe Perches's 'extern' removal from header file function declarations. Usually it's an argument signature change or a function being added/removed. The resolutions are trivial. 2) Some overlapping changes in qmi_wwan.c and be.h, one commit adds a new value, another changes an existing value. That sort of thing. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-10-01 17:06:14 -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-01 17:06:14 -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
xen
Kbuild