aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/Kconfig
Commit message (Expand)AuthorAgeFilesLines
* 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
| | | | | | | | * | | | | | x86, mm: enable GBPAGES option by defaultNick Piggin2008-10-221-0/+9
| | | | | | | |/ / / / / / | | | | | | |/| | | | | |
| | | | | | | * | | | | | x86: provide readq()/writeq() on 32-bit tooHitoshi Mitake2008-11-301-0/+2
| |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | |
| | | | | * | | | | | | Merge commit 'v2.6.28-rc8' into x86/docIngo Molnar2008-12-161-3/+14
| | | | | |\ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | |
| | | | | * | | | | | | x86: fix documentation typo in arch/x86/KconfigIngo Molnar2008-11-111-1/+1
| | | | | * | | | | | | x86: update CONFIG_NUMA descriptionKOSAKI Motohiro2008-11-061-6/+10
| | | | | | |/ / / / / | | | | | |/| | | | |
| | | * | | | | | | | allow bug table entries to use relative pointers (and use it on x86-64)Jan Beulich2008-12-161-0/+4
| |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Merge commit 'v2.6.28-rc7' into x86/cleanupsIngo Molnar2008-12-041-1/+1
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Merge branch 'x86/urgent' into x86/cleanupsIngo Molnar2008-11-181-1/+4
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge commit 'v2.6.28-rc5' into x86/cleanupsIngo Molnar2008-11-171-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge branch 'linus' into x86/cleanupsIngo Molnar2008-11-081-2/+10
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | |
| * | | | | | | | | | x86: simplify X86_MPPARSE config optionJan Beulich2008-10-301-10/+2
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'x86/numa' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/...Linus Torvalds2008-11-191-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | x86: make NUMA on 32-bit depend on EXPERIMENTAL againRafael J. Wysocki2008-11-121-1/+1
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'iommu-fixes-2.6.28' of git://git.kernel.org/pub/scm/linux/kerne...Ingo Molnar2008-11-181-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | / / / / / / | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | x86: Make NUMA on 32-bit depend on BROKENRafael J. Wysocki2008-11-101-1/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | x86, voyager: fix smp generic helper voyager breakageJames Bottomley2008-11-111-1/+4
|/ / / / / / /
* | | | | | | Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2008-11-061-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | x86: mention ACPI in top-level Kconfig menuBjorn Helgaas2008-11-061-1/+1
| | |/ / / / | |/| | | |
* | | | | | io mapping: clean up #ifdefsKeith Packard2008-11-031-0/+4
|/ / / / /
* | | | | Merge branch 'x86-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds2008-10-301-0/+4
|\ \ \ \ \ | |_|_|/ / |/| | | |