android_kernel_xiaomi_sm8350/arch/x86
Ingo Molnar 10d3285d0b Merge branch 'x86/urgent' into x86/core
Conflicts:

	include/asm-x86/gpio.h

Signed-off-by: Ingo Molnar <mingo@elte.hu>
2008-07-26 16:30:19 +02:00
..
boot Merge branch 'linus' into x86/header-guards 2008-07-26 15:30:40 +02:00
configs Subject: devmem, x86: fix rename of CONFIG_NONPROMISC_DEVMEM 2008-07-20 08:35:55 +02:00
crypto
ia32 x86_64: fix ia32 AMD syscall audit fast-path 2008-07-25 20:02:41 -07:00
kernel Merge branch 'x86/urgent' into x86/core 2008-07-26 16:30:19 +02:00
kvm KVM: MMU: Fix potential race setting upper shadow ptes on nonpae hosts 2008-07-20 12:42:40 +03:00
lguest x86, lguest: fix apic_ops build on UP 2008-07-20 17:03:45 +02:00
lib Merge branch 'generic-ipi' into generic-ipi-for-linus 2008-07-15 21:55:59 +02:00
mach-default x86: add ->pre_time_init to x86_quirks 2008-07-20 09:25:52 +02:00
mach-es7000 x86: move the last Dprintk instance to pr_debug() 2008-07-21 21:58:34 +02:00
mach-generic
mach-rdc321x
mach-voyager Merge branch 'generic-ipi' into generic-ipi-for-linus 2008-07-15 21:55:59 +02:00
math-emu
mm x86: add hugepagesz option on 64-bit 2008-07-24 10:47:19 -07:00
oprofile x86/oprofile/nmi_int: add Nehalem to list of ppro cores 2008-07-24 17:29:00 -07:00
pci use generic_access_phys for /dev/mem mappings 2008-07-24 10:47:15 -07:00
power
vdso Merge branches 'x86/urgent', 'x86/amd-iommu', 'x86/apic', 'x86/cleanups', 'x86/core', 'x86/cpu', 'x86/fixmap', 'x86/gart', 'x86/kprobes', 'x86/memtest', 'x86/modules', 'x86/nmi', 'x86/pat', 'x86/reboot', 'x86/setup', 'x86/step', 'x86/unify-pci', 'x86/uv', 'x86/xen' and 'xen-64bit' into x86/for-linus 2008-07-21 16:37:17 +02:00
video
xen Merge branch 'linus' into x86/x2apic 2008-07-25 13:08:16 +02:00
Kconfig Merge branch 'x86/urgent' into x86/core 2008-07-26 16:30:19 +02:00
Kconfig.cpu x86: fix crash due to missing debugctlmsr on AMD K6-3 2008-07-22 14:16:37 +02:00
Kconfig.debug x86: Fix help message for STRICT_DEVMEM config option 2008-07-21 13:04:08 -07:00
Makefile x86, RDC321x: add to mach-default 2008-07-26 13:51:46 +02:00
Makefile_32.cpu