aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/Kconfig
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * x86/voyager: fix compile breakage caused by dc1e35c6e95e8923cf1d3510438b63c60...James Bottomley2008-10-311-0/+4
* | Merge commit 'v2.6.28-rc2' into tracing/urgentIngo Molnar2008-10-271-0/+5
|\ \ | |/
| * Merge branch 'linus' into testLen Brown2008-10-231-55/+162
| |\
| * \ Merge branch 'i7300_idle' into testLen Brown2008-10-221-0/+2
| |\ \
| | * | i7300_idle driver v1.55Andy Henroid2008-10-211-0/+2
| * | | cpuidle: upon BIOS bug, default to default_idle rather than pollingVenkatesh Pallipadi2008-10-161-0/+3
| |/ /
* | | Merge branch 'tracing/ftrace' into tracing/urgentIngo Molnar2008-10-221-1/+1
|\ \ \ | |_|/ |/| |
| * | ftrace: rename FTRACE to FUNCTION_TRACERSteven Rostedt2008-10-201-1/+1
| * | Merge branch 'linus' into tracing-v28-for-linus-v3Ingo Molnar2008-10-191-23/+10
| |\ \
* | \ \ Merge branch 'tracing-v28-for-linus' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds2008-10-201-0/+1
|\ \ \ \ | |/ / /
| * | | ftrace: enable using mcount recording on x86Steven Rostedt2008-10-141-0/+1
* | | | Merge branch 'genirq-v28-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2008-10-201-8/+0
|\ \ \ \
| * | | | genirq: revert dynarrayThomas Gleixner2008-10-161-1/+0
| * | | | x86: remove sparse irq from KconfigThomas Gleixner2008-10-161-11/+0
| * | | | x86: make HAVE_SPARSE_IRQ support selectableYinghai Lu2008-10-161-1/+11
| * | | | x86: make 32 bit to use sparse_irqYinghai Lu2008-10-161-1/+1
| * | | | x86: remove irqbalance in kernel for 32 bitYinghai Lu2008-10-161-8/+0
| * | | | generic: sparse irqs: use irq_desc() together with dyn_array, instead of irq_...Yinghai Lu2008-10-161-0/+1
| * | | | x86: enable dyn_array supportYinghai Lu2008-10-161-0/+1
* | | | | container freezer: implement freezer cgroup subsystemMatt Helsley2008-10-201-0/+1
| |_|/ / |/| | |
* | | | Merge branch 'core-v28-for-linus' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2008-10-161-1/+3
|\ \ \ \
| | \ \ \
| | \ \ \
| | \ \ \
| | \ \ \
| *---. \ \ \ Merge branches 'core/softlockup', 'core/softirq', 'core/resources', 'core/pri...Ingo Molnar2008-10-151-1/+3
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | / | | | |_|_|/ | | |/| | |
| | | * | | generic: redefine resource_size_t as phys_addr_tJeremy Fitzhardinge2008-09-141-1/+0
| | | * | | generic: add phys_addr_t for holding physical addressesJeremy Fitzhardinge2008-09-141-0/+3
| | |/ / /
* | | | | Kconfig: eliminate "def_bool n" constructsJan Beulich2008-10-161-18/+5
|/ / / /
* | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torval...David Woodhouse2008-10-131-24/+150
|\ \ \ \ | | |_|/ | |/| |
| | | |
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| *-------. \ \ Merge branches 'x86/xen', 'x86/build', 'x86/microcode', 'x86/mm-debug-v2', 'x...Ingo Molnar2008-10-121-9/+81
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | | | | * | | Merge branch 'linus' into x86/memory-corruption-checkIngo Molnar2008-10-121-15/+69
| | | | | |\ \ \ | | |_|_|_|/ / / | |/| | | | | |
| | | | | * | | x86: add X86_RESERVE_LOW_64KIngo Molnar2008-09-161-0/+20
| | | | | * | | x86: default corruption check to off, but put parameter default in KconfigJeremy Fitzhardinge2008-09-071-1/+8
| | | | | * | | x86: clean up memory corruption check and add more kernel parametersJeremy Fitzhardinge2008-09-071-3/+23
| | | | | * | | x86: check for and defend against BIOS memory corruptionJeremy Fitzhardinge2008-09-071-0/+3
| | | |_|/ / / | | |/| | | |
| | | * | | | Merge commit 'v2.6.27-rc7' into x86/microcodeIngo Molnar2008-09-241-26/+11
| | | |\ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | x86: moved microcode.c to microcode_intel.cDmitry Adamushko2008-09-231-8/+2
| | | * | | | Merge commit 'v2.6.27-rc1' into x86/microcodeIngo Molnar2008-07-291-0/+1
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| |
| | | * | | | x86: AMD microcode patch loading supportPeter Oruba2008-07-281-4/+17
| | | * | | | x86: major refactoringPeter Oruba2008-07-281-5/+20
| * | | | | | Merge branch 'x86/apic' into x86-v28-for-linus-phase4-BIngo Molnar2008-10-111-0/+8
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'linus' into x86/coreIngo Molnar2008-08-141-1/+0
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge commit 'v2.6.27-rc1' into x86/coreIngo Molnar2008-07-301-0/+10
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | |
| | * | | | | | | Merge branch 'x86/urgent' into x86/coreIngo Molnar2008-07-261-15/+11
| | |\ \ \ \ \ \ \