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
..
acpi	treewide: replace obsolete _refok by __ref	2016-08-02 17:31:41 -04:00
asm-generic	Merge branch 'uaccess-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2016-09-14 09:35:05 -07:00
clocksource
crypto	A number of improvements for the /dev/random driver; the most	2016-07-27 15:11:55 -07:00
drm	Merge branch 'drm-next-4.8' of git://people.freedesktop.org/~agd5f/linux into drm-next	2016-08-08 16:45:33 +10:00
dt-bindings	ARM: DT updates for v4.8	2016-08-01 18:37:45 -04:00
keys
kvm	KVM/ARM Changes for v4.8 - Take 2	2016-08-04 13:59:56 +02: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
math-emu
media	[media] cec: rename cec_devnode fhs_lock to just lock	2016-08-22 13:09:06 -03:00
memory
misc
net	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2016-09-25 23:34:19 +02:00
pcmcia
ras
rdma	IB/core: Use memdup_user() rather than duplicating its implementation	2016-08-23 12:40:13 -04:00
rxrpc	rxrpc: Add tracepoint for ACK proposal	2016-09-23 15:49:19 +01:00
scsi	Merge remote-tracking branch 'mkp-scsi/4.8/scsi-fixes' into fixes	2016-08-19 07:41:12 -07:00
soc	ARM: SoC driver updates for v4.8	2016-08-01 18:36:01 -04:00
sound	Merge tag 'drm-for-v4.8' of git://people.freedesktop.org/~airlied/linux	2016-08-01 21:44:08 -04:00
target
trace	rxrpc: Implement slow-start	2016-09-24 23:49:46 +01:00
uapi	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2016-09-25 23:34:19 +02:00
video
xen	xen: change the type of xen_vcpu_id to uint32_t	2016-08-24 18:17:27 +01:00
Kbuild