aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/Kconfig
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'efi/urgent' into x86/urgentH. Peter Anvin2013-04-191-0/+1
|\
| * x86/Kconfig: Make EFI select UCS2_STRINGSergey Vlasov2013-04-161-0/+1
* | Select VIRT_TO_BUS directly where neededStephen Rothwell2013-03-121-1/+1
|/
* arch Kconfig: centralise CONFIG_ARCH_NO_VIRT_TO_BUSStephen Rothwell2013-02-271-0/+1
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2013-02-231-1/+3
|\
| * burying unused conditionalsAl Viro2013-02-141-4/+0
| * x86: switch to generic old sigactionAl Viro2013-02-031-0/+2
| * x86: switch to generic compat rt_sigaction()Al Viro2013-02-031-0/+1
| * x86,um: switch to generic old sigsuspend()Al Viro2013-02-031-0/+1
| * x86: switch to generic compat rt_sigqueueinfo()Al Viro2013-02-031-0/+1
| * x86: switch to generic compat rt_sigpending()Al Viro2013-02-031-0/+1
* | Merge branch 'x86/microcode' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2013-02-221-0/+18
|\ \
| * | x86/Kconfig: Make early microcode loading a configuration featureFenghua Yu2013-01-311-0/+18
| |/
* | 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
| |/ /