David S. Miller 1f6d80358d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: arch/mips/net/bpf_jit.c drivers/net/can/flexcan.c Both the flexcan and MIPS bpf_jit conflicts were cases of simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-09-23 12:09:27 -04:00
..
boot	x86/efi: Fixup GOT in all boot code paths	2014-09-08 20:52:02 +01:00
configs	USB: remove CONFIG_USB_DEBUG from defconfig files	2014-05-28 09:40:45 -07:00
crypto	Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2014-08-04 09:52:51 -07:00
ia32
include	Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2014-09-19 09:07:47 -07:00
kernel	Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2014-09-19 10:31:36 -07:00
kvm	KVM: x86: do not check CS.DPL against RPL during task switch	2014-08-19 15:12:28 +02:00
lguest
lib	Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2014-06-12 19:18:49 -07:00
math-emu
mm	x86/mm: Apply the section attribute to the variable, not its type	2014-09-09 07:13:39 +02:00
net	net: bpf: be friendly to kmemcheck	2014-09-09 16:58:56 -07:00
oprofile
pci	PCI updates for v3.17:	2014-09-19 10:50:30 -07:00
platform	Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2014-08-13 18:23:32 -06:00
power	x86, power, suspend: Annotate restore_processor_state() with notrace	2014-07-17 09:45:05 -04:00
purgatory	x86/purgatory: use approprate -m64/-32 build flag for arch/x86/purgatory	2014-08-29 16:28:16 -07:00
realmode
syscalls	kexec: new syscall kexec_file_load() declaration	2014-08-08 15:57:32 -07:00
tools
um	Merge branch 'signal-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/misc	2014-08-09 09:58:12 -07:00
vdso	arm64,ia64,ppc,s390,sh,tile,um,x86,mm: remove default gate area	2014-08-08 15:57:27 -07:00
video
xen	x86/xen: don't copy bogus duplicate entries into kernel page tables	2014-09-10 15:23:42 +01:00
.gitignore
Kbuild	kexec: create a new config option CONFIG_KEXEC_FILE for new syscall	2014-08-29 16:28:16 -07:00
Kconfig	Make ARCH_HAS_FAST_MULTIPLIER a real config variable	2014-09-13 11:14:53 -07:00
Kconfig.cpu
Kconfig.debug
Makefile	kexec: purgatory: add clean-up for purgatory directory	2014-08-29 16:28:17 -07:00
Makefile_32.cpu
Makefile.um