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

Resolve conflict between commit 264640fc2c ("ipv6: distinguish frag
queues by device for multicast and link-local packets") from the net
tree and commit 029f7f3b87 ("netfilter: ipv6: nf_defrag: avoid/free
clone operations") from the nf-next tree.

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

Conflicts:
	net/ipv6/netfilter/nf_conntrack_reasm.c

2015-12-14 20:31:16 +01:00

..

asm-generic

mm: mlock: add mlock flags to enable VM_LOCKONFAULT usage

2015-11-05 19:34:48 -08:00

drm

Merge tag 'topic/drm-fixes-2015-11-11' of git://anongit.freedesktop.org/drm-intel into drm-fixes

2015-11-13 09:54:31 +10:00

linux

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

2015-12-14 20:31:16 +01:00

misc

cxl: Add alternate MMIO error handling

2015-08-18 19:34:43 +10:00

mtd

mtd: mtd-user: remove stdint.h include

2015-10-19 18:19:06 -07:00

rdma

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma

2015-11-07 13:33:07 -08:00

scsi

cxlflash: Virtual LUN support

2015-08-26 18:05:39 -07:00

sound

Merge tag 'asoc-v4.3-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next

2015-10-26 12:14:49 +01:00

video

…

xen

xen/gntdev: use types from linux/types.h in userspace headers

2015-10-23 14:20:45 +01:00

Kbuild

…