David S. Miller b633353115 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/phy/bcm7xxx.c drivers/net/phy/marvell.c drivers/net/vxlan.c All three conflicts were cases of simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-02-23 00:09:14 -05:00
..
boot	UBSAN: run-time undefined behavior sanity checker	2016-01-20 17:09:18 -08:00
configs	Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux	2015-09-04 15:49:32 -07:00
crypto	crypto: chacha20-ssse3 - Align stack pointer to 64 bytes	2016-01-25 21:47:45 +08:00
entry	UBSAN: run-time undefined behavior sanity checker	2016-01-20 17:09:18 -08:00
ia32	Merge branch 'x86-headers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2015-11-03 21:05:40 -08:00
include	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-02-23 00:09:14 -05:00
kernel	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-02-23 00:09:14 -05:00
kvm	kvm: rename pfn_t to kvm_pfn_t	2016-01-15 17:56:32 -08:00
lguest	Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2016-01-11 16:26:03 -08:00
lib	x86/uaccess/64: Handle the caching of 4-byte nocache copies properly in __copy_user_nocache()	2016-02-17 09:10:23 +01:00
math-emu	Merge branch 'x86-headers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2015-11-03 21:05:40 -08:00
mm	Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2016-02-20 09:32:40 -08:00
net	bpf, x86: detect/optimize loading 0 immediates	2015-12-18 16:04:51 -05:00
oprofile	perf: generalize perf_callchain	2016-02-20 00:21:44 -05:00
pci	PCI changes for the v4.5 merge window:	2016-01-21 11:52:16 -08:00
platform	Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2016-01-31 16:17:19 -08:00
power	x86/pm: Introduce quirk framework to save/restore extra MSR registers around suspend/resume	2015-11-26 10:04:53 +01:00
purgatory
ras	x86/ras/mce_amd_inj: Inject bank 4 errors on the NBC	2015-10-12 16:15:48 +02:00
realmode	UBSAN: run-time undefined behavior sanity checker	2016-01-20 17:09:18 -08:00
tools
um	virtio: barrier rework+fixes	2016-01-18 16:44:24 -08:00
video
xen	xen: features and fixes for 4.5-rc0	2016-01-12 13:05:36 -08:00
.gitignore
Kbuild
Kconfig	hpet: Drop stale URLs	2016-02-17 09:39:56 +01:00
Kconfig.cpu	x86/Kconfig/cpus: Fix/complete CPU type help texts	2015-10-21 11:12:56 +02:00
Kconfig.debug	libnvdimm for 4.5	2016-01-13 19:15:14 -08:00
Makefile	Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2015-11-04 09:11:12 -08:00
Makefile_32.cpu
Makefile.um