You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Ingo Molnar
82268da1b1
Merge branch 'linus' into percpu-cpumask-x86-for-linus-2
...
Conflicts:
arch/sparc/kernel/time_64.c
drivers/gpu/drm/drm_proc.c
Manual merge to resolve build warning due to phys_addr_t type change
on x86:
drivers/gpu/drm/drm_info.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
16 years ago
..
boot
Merge branches 'x86/apic', 'x86/cpu', 'x86/fixmap', 'x86/mm', 'x86/sched', 'x86/setup-lzma', 'x86/signal' and 'x86/urgent' into x86/core
16 years ago
configs
Merge branches 'x86/apic', 'x86/defconfig', 'x86/memtest', 'x86/mm' and 'linus' into x86/core
16 years ago
crypto
crypto: aes-ni - Add support to Intel AES-NI instructions for x86_64 platform
16 years ago
ia32
Merge branch 'linus' into percpu-cpumask-x86-for-linus-2
16 years ago
include/ asm
Merge branch 'linus' into percpu-cpumask-x86-for-linus-2
16 years ago
kernel
Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2
16 years ago
kvm
KVM: VMX: Don't allow uninhibited access to EFER on i386
16 years ago
lguest
Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2
16 years ago
lib
x86: use _types.h headers in asm where available
16 years ago
math-emu
Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2
16 years ago
mm
Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2
16 years ago
oprofile
x86: oprofile: don't set counter width from cpuid on Core2
16 years ago
pci
x86, apic: remove genapic.h
16 years ago
power
x86: use _types.h headers in asm where available
16 years ago
vdso
x86, mm: rename TASK_SIZE64 => TASK_SIZE_MAX
16 years ago
video
…
xen
Merge branch 'x86/core' into core/percpu
16 years ago
Kconfig
Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2
16 years ago
Kconfig.cpu
Merge branch 'x86/urgent' into core/percpu
16 years ago
Kconfig.debug
Merge branch 'linus' into x86/apic
16 years ago
Makefile
Merge branch 'core/percpu' into x86/core
16 years ago
Makefile_32.cpu
…