summaryrefslogtreecommitdiffstats
path: root/arch/x86/Kconfig
Commit message (Expand)AuthorAgeFilesLines
* Merge branches 'iommu/api' and 'iommu/amd' into for-linusJoerg Roedel2009-01-031-0/+10
|\
| * AMD IOMMU: add Kconfig entry for statistic collection codeJoerg Roedel2009-01-031-0/+10
* | select IOMMU_API when DMAR and/or AMD_IOMMU is selectedJoerg Roedel2009-01-031-0/+3
|/
* Merge branch 'cpus4096-for-linus-2' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2009-01-021-6/+7
|\
| * Merge branch 'irq/sparseirq' into cpus4096Ingo Molnar2008-12-171-1/+10
| |\
| * | x86: Set CONFIG_NR_CPUS even on UPMike Travis2008-12-161-3/+3
| * | x86: enable MAXSMPMike Travis2008-12-161-3/+4
| | |
| | \
| | \
| | \
| *---. \ Merge branches 'irq/sparseirq', 'x86/quirks' and 'x86/reboot' into cpus4096Ingo Molnar2008-12-121-11/+10
| |\ \ \ \
| * \ \ \ \ Merge branch 'tracing/fastboot' into cpus4096Ingo Molnar2008-12-121-1/+1
| |\ \ \ \ \
| | \ \ \ \ \
| | \ \ \ \ \
| *-. \ \ \ \ \ Merge branches 'sched/core', 'core/core' and 'tracing/core' into cpus4096Ingo Molnar2008-11-241-0/+3
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2008-12-301-0/+22
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | x86, sparseirq: clean up Kconfig entryIngo Molnar2008-12-251-3/+7
| * | | | | | | | | x86: turn CONFIG_SPARSE_IRQ off by defaultIngo Molnar2008-12-251-1/+0
| * | | | | | | | | sparseirq: fix numa_migrate_irq_desc dependency and commentsYinghai Lu2008-12-191-1/+1
| | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | sparseirq: fix !SMP building, #2Yinghai Lu2008-12-171-1/+1
| * | | | | | | | x86, sparseirq: move irq_desc according to smp_affinity, v7Yinghai Lu2008-12-171-0/+9
| | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | sparseirq: fix !SMP && !PCI_MSI && !HT_IRQ buildYinghai Lu2008-12-091-1/+1
| * | | | | | | sparse irq_desc[] array: core kernel and x86 changesYinghai Lu2008-12-081-0/+10
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds2008-12-301-1/+1
|\ \ \ \ \ \ \
| * | | | | | | x86: correct link to HPET timer specificationDenis V. Lunev2008-11-241-1/+1
| |/ / / / / /
* | | | | | | Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2008-12-281-2/+2
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge commit 'v2.6.28-rc6' into sched/coreIngo Molnar2008-11-211-2/+5
| |\| | | | |
| * | | | | | Merge branch 'linus' into sched/coreIngo Molnar2008-11-191-1/+1
| |\ \ \ \ \ \
| * | | | | | | sched: rename SCHED_NO_NO_OMIT_FRAME_POINTER => SCHED_OMIT_FRAME_POINTERIngo Molnar2008-11-111-1/+1
| * | | | | | | Merge branch 'sched/urgent' into sched/coreIngo Molnar2008-11-071-1/+5
| |\ \ \ \ \ \ \
| * | | | | | | | x86, sched: enable wchan config menu item on 64-bitKen Chen2008-11-061-1/+1
* | | | | | | | | Merge branch 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/k...Linus Torvalds2008-12-281-0/+3
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | tracing/function-graph-tracer: support for x86-64Frederic Weisbecker2008-12-021-1/+1
| * | | | | | | | tracing/function-return-tracer: change the name into function-graph-tracerFrederic Weisbecker2008-11-261-1/+1
| | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | tracing/stack-tracer: introduce CONFIG_USER_STACKTRACE_SUPPORTTörök Edwin2008-11-231-0/+1
| | | | | | | |
| | \ \ \ \ \ \
| *-. \ \ \ \ \ \ Merge branches 'tracing/profiling', 'tracing/options' and 'tracing/urgent' in...Ingo Molnar2008-11-231-2/+5
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | / / / | | | | |_|/ / / | | | |/| | | |
| * | | | | | | Merge branch 'tracing/function-return-tracer' into tracing/fastbootIngo Molnar2008-11-121-0/+1
| |\ \ \ \ \ \ \
| | * | | | | | | tracing, x86: clean up FUNCTION_RET_TRACER KconfigIngo Molnar2008-11-111-1/+1
| | * | | | | | | tracing, x86: add low level support for ftrace return tracingFrederic Weisbecker2008-11-111-0/+1
| * | | | | | | | Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/coreIngo Molnar2008-11-121-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| / / / / / / | | |/ / / / / /
| * | | | | | | Merge branch 'tracing/urgent' into tracing/ftraceIngo Molnar2008-11-111-1/+1
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | | | | | | |
| | \ \ \ \ \ \
| *-. \ \ \ \ \ \ Merge branches 'tracing/ftrace', 'tracing/fastboot', 'tracing/nmisafe' and 't...Ingo Molnar2008-11-081-0/+4
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| * / | | | | | | ftrace: add quick function trace stopSteven Rostedt2008-11-061-0/+1
| |/ / / / / / /
* | | | | | | | Merge branch 'x86/iommu' into x86/coreIngo Molnar2008-12-231-1/+1
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'x86/io' into x86/iommuIngo Molnar2008-12-031-0/+2
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'x86/urgent' into x86/iommuIngo Molnar2008-12-011-2/+5
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |
| * | | | | | | | | x86: default to SWIOTLB=y on x86_64Joerg Roedel2008-11-181-1/+1
| | |_|_|_|_|/ / / | |/| | | | | | |
| | | | | | | | |
| \ \ \ \ \ \ \ \
| \ \ \ \ \ \ \ \
| \ \ \ \ \ \ \ \
| \ \ \ \ \ \ \ \
| \ \ \ \ \ \ \ \
| \ \ \ \ \ \ \ \
| \ \ \ \ \ \ \ \
| \ \ \ \ \ \ \ \
| \ \ \ \ \ \ \ \
| \ \ \ \ \ \ \ \
| \ \ \ \ \ \ \ \
| \ \ \ \ \ \ \ \
| \ \ \ \ \ \ \ \
| \ \ \ \ \ \ \ \
| \ \ \ \ \ \ \ \
| \ \ \ \ \ \ \ \
| \ \ \ \ \ \ \ \
| \ \ \ \ \ \ \ \
| \ \ \ \ \ \ \ \
| \ \ \ \ \ \ \ \
| \ \ \ \ \ \ \ \
| \ \ \ \ \ \ \ \
| \ \ \ \ \ \ \ \
| \ \ \ \ \ \ \ \
| \ \ \ \ \ \ \ \
*-------------------------. \ \ \ \ \ \ \ \ Merge branches 'x86/apic', 'x86/cleanups', 'x86/cpufeature', 'x86/crashdump',...Ingo Molnar2008-12-231-27/+55
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | / / / / / / / | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | / / / / / / | | | | | | | | |_|_|_|_|_|_|/ / / / / / | | | | | | | |/| | | | | | | / / / / / | | | | | |_|_|_|_|_|_|_|_|_|/ / / / / | | | | |/| | | | | | | | | | | / / / | | | | | | | | | | | | | |_|_|/ / / | | | | | | | | | | | | |/| | | / / | | | | | | | | | | | | | | |_|/ / | | | | | | | | | | | | | |/| | / | | | | | | | | | | | | | | | |/ | | | | | | | | | | | | | | |/|
| | | | | | | | | | | | | | * | x86, apm: remove CONFIG_APM_REAL_MODE_POWER_OFF in favor of a kernel parameterNiels de Vos2008-12-021-7/+0
| | | | | | | | | | | | | |/ / | | | | | | | | | | | | |/| |
| | | | | | | | | | | | | * | Merge branch 'linus' into x86/quirksIngo Molnar2008-12-081-2/+5
| | | | | | | | | | | | | |\ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | |
| | | | | | | | | | | | | * | x86: use update_genapic to get rid of ES7000_CLUSTERED_APIC v2Yinghai Lu2008-11-181-4/+0
| | | |_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | |
| | | | | | | | | | | * | | Merge commit 'v2.6.28-rc2' into x86/pci-ioapic-boot-irq-quirksIngo Molnar2008-10-281-95/+200
| | | | | | | | | | | |\ \ \ | | | | | | | | | | |_|/ / / | | | | | | | | | |/| | | |
| | | | | | | | | | | * | | x86, pci: introduce config option for pci reroute quirks (was: [PATCH 0/3] Bo...Stefan Assmann2008-07-181-0/+24
| | | | | | | | * | | | | | Merge commit 'v2.6.28-rc8' into x86/mmIngo Molnar2008-12-121-3/+19
| | | | | | | | |\ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | |
| | | | | | | | * | | | | | x86: add memory hotremove config optionGary Hade2008-11-031-0/+4
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 17:09:08 +0000