David S. Miller c5e40ee287 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: net/bridge/br_mdb.c br_mdb.c conflict was a function call being removed to fix a bug in 'net' but whose signature was changed in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-07-23 00:41:16 -07:00
..
boot	The libnvdimm sub-system introduces, in addition to the libnvdimm-core,	2015-06-29 10:34:42 -07:00
configs	kconfig: add xenconfig defconfig helper	2015-06-16 11:04:29 +01:00
crypto	crypto: aesni - fix failing setkey for rfc4106-gcm-aesni	2015-06-29 16:06:30 +08:00
entry	x86/entry/64, x86/nmi/64: Add CONFIG_DEBUG_ENTRY NMI testing code	2015-07-17 12:50:14 +02:00
ia32	Merge branch 'x86-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2015-06-22 17:59:09 -07:00
include	Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2015-07-18 10:49:57 -07:00
kernel	Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2015-07-18 10:49:57 -07:00
kvm	kvm: x86: fix load xsave feature warning	2015-07-10 13:26:45 +02:00
lguest	Merge branch 'x86-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2015-06-22 17:59:09 -07:00
lib	perf/x86: Fix copy_from_user_nmi() return if range is not ok	2015-07-06 14:09:27 +02:00
math-emu
mm	x86/kasan: Add message about KASAN being initialized	2015-07-06 14:53:14 +02:00
net	bpf: introduce bpf_skb_vlan_push/pop() helpers	2015-07-20 20:52:31 -07:00
oprofile
pci	PCI changes for the v4.2 merge window:	2015-06-23 13:41:24 -07:00
platform	Replace module_init with equivalent device_initcall in non modules.	2015-07-02 10:30:48 -07:00
power	Merge branch 'x86-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2015-06-22 17:59:09 -07:00
purgatory
realmode
tools
um	Merge branch 'for-linus-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml	2015-06-28 13:55:08 -07:00
video
xen	Merge branch 'x86-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2015-06-22 17:59:09 -07:00
.gitignore
Kbuild	x86/asm/entry, x86/vdso: Move the vDSO code to arch/x86/entry/vdso/	2015-06-03 18:51:37 +02:00
Kconfig	x86/fpu, sched: Introduce CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT and use it on x86	2015-07-18 03:42:51 +02:00
Kconfig.cpu
Kconfig.debug	x86/entry/64, x86/nmi/64: Add CONFIG_DEBUG_ENTRY NMI testing code	2015-07-17 12:50:14 +02:00
Makefile	x86/asm/entry: Move the arch/x86/syscalls/ definitions to arch/x86/entry/syscalls/	2015-06-04 07:37:37 +02:00
Makefile.um
Makefile_32.cpu