summaryrefslogtreecommitdiffstats
path: root/arch/x86/Kconfig (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'linus/master' into HEADVegard Nossum2009-06-151-4/+41
|\
| * Merge branch 'linus' into x86/mce3Ingo Molnar2009-06-111-17/+25
| |\
| * \ Merge branch 'irq/numa' into x86/mce3H. Peter Anvin2009-06-021-9/+3
| |\ \
| * | | x86: trivial clean up for arch/x86/KconfigHidetoshi Seto2009-05-281-7/+7
| * | | x86, mce: add basic error injection infrastructureAndi Kleen2009-05-281-0/+8
| * | | x86, mce: enable MCE_AMD for 32bit NEW_MCEAndi Kleen2009-05-281-1/+1
| * | | x86, mce: enable MCE_INTEL for 32bit new MCEAndi Kleen2009-05-281-1/+1
| * | | x86, mce: use 64bit machine check code on 32bitAndi Kleen2009-05-281-2/+31
* | | | kmemcheck: make kconfig accessible for other architecturesPekka Enberg2009-06-151-0/+1
| |_|/ |/| |
* | | Merge branch 'linus' into perfcounters/coreIngo Molnar2009-06-111-26/+27
|\ \ \
| * \ \ Merge branch 'x86-kbuild-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2009-06-111-17/+24
| |\ \ \ | | |_|/ | |/| |
| | * | x86: make CONFIG_RELOCATABLE the defaultH. Peter Anvin2009-05-121-2/+2
| | * | x86: default CONFIG_PHYSICAL_START and CONFIG_PHYSICAL_ALIGN to 16 MBH. Peter Anvin2009-05-121-15/+12
| | * | x86: add a Kconfig symbol for when relocations are neededH. Peter Anvin2009-05-091-0/+5
| | * | x86: unify arch/x86/boot/compressed/vmlinux_*.ldsLinus Torvalds2009-04-271-0/+5
| * | | Merge branch 'linus' into irq/numaIngo Molnar2009-06-011-0/+13
| |\ \ \ | | | |/ | | |/|
| * | | Merge branch 'x86/apic' into irq/numaIngo Molnar2009-05-011-1/+1
| |\ \ \
| | * | | x86: x2apic, IR: Make config X86_UV dependent on X86_X2APICSuresh Siddha2009-04-211-1/+1
| * | | | x86/irq: use move_irq_desc() in create_irq_nr()Yinghai Lu2009-05-011-0/+4
| * | | | x86/irq: remove leftover code from NUMA_MIGRATE_IRQ_DESCYinghai Lu2009-04-281-10/+0
* | | | | Merge branch 'linus' into perfcounters/coreIngo Molnar2009-06-011-0/+13
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | x86: Fix performance regression caused by paravirt_ops on native kernelsJeremy Fitzhardinge2009-05-151-0/+13
| |/ / /
* | | | Merge branch 'linus' into perfcounters/coreIngo Molnar2009-04-291-5/+4
|\| | |
| * | | Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2009-04-261-0/+1
| |\ \ \
| | * | | x86: more than 8 32-bit CPUs requires X86_BIGSMPMichael K. Johnson2009-04-221-0/+1
| | |/ /
| * | | Merge branch 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2009-04-261-0/+1
| |\ \ \ | | |/ / | |/| |
| | * | x86/irq: mark NUMA_MIGRATE_IRQ_DESC brokenYinghai Lu2009-04-171-0/+1
| | |/
| * | Merge branch 'x86/uv' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/li...Linus Torvalds2009-04-171-0/+1
| |\ \ | | |/ | |/|
| | * x86, uv: add Kconfig dependency on NUMA for UV systemsJack Steiner2009-04-081-0/+1
| * | x86, intel-iommu: fix X2APIC && !ACPI build failureDavid Woodhouse2009-04-071-5/+1
* | | Merge branch 'linus' into perfcounters/coreIngo Molnar2009-04-071-1/+1
|\| |
| * | Merge git://git.infradead.org/iommu-2.6Linus Torvalds2009-04-061-1/+1
| |\ \
| | * | x2apic/intr-remap: decouple interrupt remapping from x2apicHan, Weidong2009-04-041-1/+1
* | | | Merge branch 'linus' into perfcounters/core-v2Ingo Molnar2009-04-061-7/+33
|\| | |
| * | | Merge branch 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2009-04-051-0/+2
| |\ \ \
| | * \ \ Merge branch 'tracing/core-v2' into tracing-for-linusIngo Molnar2009-04-021-0/+2
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Merge branch 'x86/asm' into tracing/syscallsIngo Molnar2009-03-141-1/+7
| | | |\ \
| | | * | | tracing/x86: basic implementation of syscall tracing for x86Frederic Weisbecker2009-03-131-0/+1
| | | * | | Merge branch 'x86/core' into tracing/texteditIngo Molnar2009-03-061-317/+345
| | | |\ \ \
| | | * \ \ \ Merge branches 'tracing/ftrace', 'tracing/mmiotrace' and 'linus' into tracing...Ingo Molnar2009-03-021-1/+1
| | | |\ \ \ \
| | | * \ \ \ \ Merge branches 'tracing/ftrace', 'tracing/ring-buffer', 'tracing/sysprof', 't...Ingo Molnar2009-02-131-0/+11
| | | |\ \ \ \ \
| | | * | | | | | ftrace: change function graph tracer to use new in_nmiSteven Rostedt2009-02-081-1/+1
| | | * | | | | | ring-buffer: add NMI protection for spinlocksSteven Rostedt2009-02-081-0/+1
| * | | | | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2009-04-041-2/+2
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| | * | | | | | | trivial: fix typos/grammar errors in Kconfig textsMatt LaPlante2009-03-301-2/+2
| * | | | | | | | Merge git://git.infradead.org/iommu-2.6Linus Torvalds2009-04-031-2/+2
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | intel-iommu: Enable DMAR on 32-bit kernel.David Woodhouse2009-03-251-1/+1
| | | |_|_|/ / / | | |/| | | | |
| * | | | | | | generic debug pageallocAkinobu Mita2009-04-011-0/+3
| * | | | | | | Merge branch 'iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds2009-03-301-0/+1
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'linus' into core/iommuIngo Molnar2009-03-281-317/+343
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |