Pablo Neira Ayuso f20fbc0717 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next ... Conflicts: net/netfilter/core.c net/netfilter/nf_tables_netdev.c Resolve two conflicts before pull request for David's net-next tree: 1) Between c73c248490 ("netfilter: nf_tables_netdev: remove redundant ip_hdr assignment") from the net tree and commit ddc8b6027a ("netfilter: introduce nft_set_pktinfo_{ipv4, ipv6}_validate()"). 2) Between e8bffe0cf9 ("net: Add _nf_(un)register_hooks symbols") and Aaron Conole's patches to replace list_head with single linked list. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>		2016-09-25 23:34:19 +02:00
..
asm-generic	asm-generic: Drop renameat syscall from default list	2016-05-05 00:42:21 +02:00
drm	Merge tag 'topic/drm-misc-2016-07-22' of git://anongit.freedesktop.org/drm-intel into drm-next	2016-07-27 10:33:08 +10:00
linux	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2016-09-25 23:34:19 +02:00
misc	cxl: Use fixed width predefined types in data structure.	2016-08-09 16:52:01 +10:00
mtd	mtd: kill the nand_ecclayout struct	2016-05-05 23:51:51 +02:00
rdma	Second round of merge items for 4.8	2016-08-04 20:26:31 -04:00
scsi
sound	ALSA: uapi: Add three missing header files to Kbuild file	2016-05-31 17:33:32 +02:00
video
xen	xen/evtchn: add IOCTL_EVTCHN_RESTRICT	2016-07-25 10:59:31 +01:00
Kbuild