summaryrefslogtreecommitdiffstats
path: root/arch/x86/Kconfig
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds2013-02-211-4/+0
|\
| * x86-32, mm: Rip out x86_32 NUMA remapping codeDave Hansen2013-01-311-4/+0
* | Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2013-02-211-2/+2
|\ \
| * | x86/cpu/hotplug: Remove CONFIG_EXPERIMENTAL dependencyKees Cook2013-01-241-2/+2
| |/
* | Merge tag 'driver-core-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds2013-02-211-12/+10
|\ \
| * | arch/x86: remove depends on CONFIG_EXPERIMENTALKees Cook2013-01-111-12/+10
| |/
* | Merge tag 'pm+acpi-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2013-02-201-0/+11
|\ \
| * \ Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/...Rafael J. Wysocki2013-02-181-0/+1
| |\ \
| | * | APM idle: register apm_cpu_idle via cpuidleLen Brown2013-02-171-0/+1
| * | | Merge branch 'acpi-lpss'Rafael J. Wysocki2013-02-111-0/+10
| |\ \ \ | | |/ / | |/| |
| | * | x86: add support for Intel Low Power SubsystemMika Westerberg2013-01-231-0/+10
| | |/
* | | Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/k...Linus Torvalds2013-02-191-0/+21
|\ \ \
| * | | x86: Add TS-5500 platform supportVivien Didelot2013-01-251-0/+9
| * | | goldfish: platform device for x86Jun Nakajima2013-01-211-0/+12
| | |/ | |/|
* | | Merge branch 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2013-02-191-1/+1
|\ \ \
| * | | x86: Default to ARCH=x86 to avoid overriding CONFIG_64BITDavid Woodhouse2012-12-201-1/+1
* | | | Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2013-02-191-0/+1
|\ \ \ \
| * \ \ \ Merge tag 'v3.8-rc7' into x86/asmH. Peter Anvin2013-02-121-0/+1
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | x86: Enable ARCH_USE_BUILTIN_BSWAPDavid Woodhouse2013-01-281-0/+1
| | |_|/ | |/| |
* | | | Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds2013-02-191-0/+1
|\ \ \ \
| * \ \ \ Merge branch 'fortglx/3.9/time' of git://git.linaro.org/people/jstultz/linux ...Thomas Gleixner2013-02-041-0/+1
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | timekeeping: Switch HAS_PERSISTENT_CLOCK to ALWAYS_USE_PERSISTENT_CLOCKJohn Stultz2013-01-291-1/+1
| | * | | x86: Select HAS_PERSISTENT_CLOCK on x86John Stultz2013-01-151-0/+1
| | | |/ | | |/|
* | | | Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2013-02-191-0/+2
|\ \ \ \
| * | | | kprobes/x86: Move ftrace-based kprobe code into kprobes-ftrace.cMasami Hiramatsu2013-01-211-0/+1
| * | | | ftrace: Move ARCH_SUPPORTS_FTRACE_SAVE_REGS in KconfigMasami Hiramatsu2013-01-211-0/+1
| | |_|/ | |/| |
* | | | Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2013-02-191-1/+0
|\ \ \ \ | |_|/ / |/| | |
| * | | Merge branch 'core/irq_work' of git://git.kernel.org/pub/scm/linux/kernel/git...Ingo Molnar2013-01-241-1/+0
| |\ \ \ | | |/ / | |/| |
| | * | irq_work: Remove CONFIG_HAVE_IRQ_WORKFrederic Weisbecker2012-11-171-1/+0
| | |/
* | / x86/olpc: Fix olpc-xo1-sci.c build errorsRandy Dunlap2013-01-241-0/+1
|/ /
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2012-12-201-2/+1
|\ \
| * | introduce generic sys_sigaltstack(), switch x86 and um to itAl Viro2012-12-191-0/+1
| * | Bury the conditionals from kernel_thread/kernel_execve seriesAl Viro2012-12-191-2/+0
* | | Merge tag 'balancenuma-v11' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2012-12-161-0/+2
|\ \ \
| * | | mm: numa: Add fault driven placement and migrationPeter Zijlstra2012-12-111-0/+2
| | |/ | |/|
* | | Merge tag 'for-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pciLinus Torvalds2012-12-131-0/+1
|\ \ \
| * | | x86/PCI: Add NumaChip remote PCI supportDaniel J Blueman2012-12-071-0/+1
| |/ /
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2012-12-121-0/+1
|\ \ \ | | |/ | |/|
| * | x86, um: switch to generic fork/vfork/cloneAl Viro2012-11-281-0/+1
| |/
* | Merge branch 'x86-nuke386-for-linus' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds2012-12-111-8/+3
|\ \
| * | x86, 386 removal: Remove CONFIG_XADDH. Peter Anvin2012-11-291-5/+0
| * | x86, 386 removal: Remove CONFIG_M386 from KconfigH. Peter Anvin2012-11-291-3/+3
| |/
* | Merge branch 'x86-bsp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linu...Linus Torvalds2012-12-111-0/+44
|\ \
| * | x86, topology: Debug CPU0 hotplugFenghua Yu2012-11-141-0/+15
| * | x86, Kconfig: Add config switch for CPU0 hotplugFenghua Yu2012-11-141-0/+29
| |/
* | Merge branch 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2012-12-111-1/+1
|\ \
| * | arch/x86/Kconfig: Allow turning off CONFIG_X86_MPPARSE when either ACPI or SF...Bin Gao2012-10-261-1/+1
| |/
* / context_tracking: New context tracking susbsystemFrederic Weisbecker2012-11-301-1/+1
|/
* Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2012-10-141-0/+2
|\
| * Make most arch asm/module.h files use asm-generic/module.hDavid Howells2012-09-281-0/+2