Pablo Neira Ayuso 81bf1c64e7 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next ...

Resolve conflicts with conntrack template fixes.

Conflicts:
	net/netfilter/nf_conntrack_core.c
	net/netfilter/nf_synproxy_core.c
	net/netfilter/xt_CT.c

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

2015-08-21 06:09:05 +02:00

..

asm-generic

errno.h: Improve ENOSYS's comment

2015-04-17 09:03:58 -04:00

drm

drm/amdgpu: Drop drm/ prefix for including drm.h in amdgpu_drm.h

2015-07-29 15:48:05 -04:00

linux

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

2015-08-21 06:09:05 +02:00

misc

cxl: Implement an ioctl to fetch afu card-id, offset-id and mode

2015-06-03 13:27:15 +10:00

mtd

mtd: lpddr: add driver for LPDDR2-NVM PCM memories

2014-05-20 17:45:17 -07:00

rdma

IB/core: Add timestamp_mask and hca_core_clock to query_device

2015-06-12 14:49:10 -04:00

scsi

[SCSI] Merge tag 'fcoe-02-19-13' into for-linus

2013-03-01 09:10:08 +00:00

sound

ASoC: topology: Add private data type and bump ABI version to 3

2015-08-06 12:34:46 +01:00

video

UAPI: (Scripted) Disintegrate include/video

2012-12-20 17:14:26 +00:00

xen

xen: install xen/gntdev.h and xen/gntalloc.h

2014-02-11 10:12:36 -05:00

Kbuild

cxl: Add userspace header file

2014-10-08 20:15:57 +11:00