summaryrefslogtreecommitdiffstats
path: root/arch/x86/Kconfig
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'kvm-updates/3.1' of git://git.kernel.org/pub/scm/virt/kvm/kvmLinus Torvalds2011-07-241-0/+12
|\
| * sched: adjust scheduler cpu power for stolen timeGlauber Costa2011-07-141-0/+12
| |
| \
| \
| \
*---. \ Merge branches 'x86-detect-hyper-for-linus', 'x86-fpu-for-linus', 'x86-kexec-...Linus Torvalds2011-07-231-2/+13
|\ \ \ \ | | |_|/ | |/| |
| | | * x86, config: Introduce an INTEL_MID configurationAlan Cox2011-07-211-2/+13
| | |/
* | | Merge branch 'timers-clocksource-for-linus' of git://git.kernel.org/pub/scm/l...Linus Torvalds2011-07-231-0/+1
|\ \ \
| * | | clocksource: apb: Share APB timer code with other platformsJamie Iles2011-06-271-0/+1
| |/ /
* | | Merge branch 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2011-07-221-0/+4
|\ \ \
| * | | clocksource: Change __ARCH_HAS_CLOCKSOURCE_DATA to a CONFIG optionH. Peter Anvin2011-07-211-0/+4
| |/ /
* | | Merge branch 'timers-cleanup-for-linus' of git://git.kernel.org/pub/scm/linux...Linus Torvalds2011-07-221-0/+2
|\ \ \
| * | | x86: Use common i8253 clockeventThomas Gleixner2011-07-011-1/+1
| * | | pcspkr: Cleanup Kconfig dependenciesRalf Baechle2011-06-091-0/+1
| * | | i8253: Consolidate all kernel definitions of i8253_lockRalf Baechle2011-06-091-0/+1
| |/ /
* | | Merge branch 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2011-07-221-79/+0
|\ \ \ | |_|/ |/| |
| * | x86/ia64: intel-iommu: move to drivers/iommu/Ohad Ben-Cohen2011-06-211-50/+0
| * | x86: amd_iommu: move to drivers/iommu/Ohad Ben-Cohen2011-06-211-28/+0
| * | drivers: iommu: move to a dedicated folderOhad Ben-Cohen2011-06-141-3/+2
| |/
* | x86: Disable AMD_NUMA for 32bit for nowTejun Heo2011-07-111-1/+1
|/
* arch: remove CONFIG_GENERIC_FIND_{NEXT_BIT,BIT_LE,LAST_BIT}Akinobu Mita2011-05-261-1/+0
* Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds2011-05-251-0/+1
|\
| * i8k: Integrate with the hwmon subsystemJean Delvare2011-05-251-0/+1
* | x86: remove 32-bit versions of readq()/writeq()Roland Dreier2011-05-251-2/+0
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6Linus Torvalds2011-05-201-0/+1
|\
| * x86/net: only select BPF_JIT when NET is enabledRandy Dunlap2011-05-041-1/+1
| * net: filter: Just In Time compiler for x86-64Eric Dumazet2011-04-271-0/+1
* | Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/k...Linus Torvalds2011-05-191-1/+1
|\ \
| * | x86, olpc: Use device tree for platform identificationDaniel Drake2011-03-151-1/+1
* | | Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds2011-05-191-20/+23
|\ \ \
| * | | x86, mm: Allow ZONE_DMA to be configurableDavid Rientjes2011-05-161-1/+8
| * | | x86, NUMA: Enable emulation on 32bit tooTejun Heo2011-05-021-1/+1
| * | | x86, NUMA: Enable CONFIG_AMD_NUMA on 32bit tooTejun Heo2011-05-021-1/+1
| * | | x86: Clean up memory model related configs in arch/x86/KconfigTejun Heo2011-04-011-13/+13
| * | | x86-64, NUMA: Remove custom phys_to_nid() implementationTejun Heo2011-04-011-4/+0
| | |/ | |/|
* | | Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2011-05-191-11/+0
|\ \ \
| * | | x86, cpu: Move AMD Elan Kconfig under "Processor family"Ian Campbell2011-04-081-11/+0
| |/ /
* | | Merge branch 'timers-clocksource-for-linus' of git://git.kernel.org/pub/scm/l...Linus Torvalds2011-05-191-0/+1
|\ \ \
| * | | clocksource: convert x86 to generic i8253 clocksourceRussell King2011-05-141-0/+1
| |/ /
* | | Merge branch 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2011-05-191-0/+1
|\ \ \
| * | | x86/amd-iommu: Select PCI_IOV with AMD IOMMU driverJoerg Roedel2011-04-111-0/+1
| |/ /
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/raf...Linus Torvalds2011-05-191-1/+0
|\ \ \
| * | | PM: Remove sysdev suspend, resume and shutdown operationsRafael J. Wysocki2011-05-111-1/+0
| |/ /
* | | [CPUFREQ] Move x86 drivers to drivers/cpufreq/Dave Jones2011-05-191-1/+1
|/ /
* | Merge branch 'syscore' of git://git.kernel.org/pub/scm/linux/kernel/git/rafae...Linus Torvalds2011-03-251-0/+1
|\ \
| * | Introduce ARCH_NO_SYSDEV_OPS config option (v2)Rafael J. Wysocki2011-03-231-0/+1
* | | rapidio: modify configuration to support PCI-SRIO controllerAlexandre Bounine2011-03-231-0/+10
|/ /
* | x86: allow CONFIG_ISA_DMA_API to be disabledDavid Rientjes2011-03-221-3/+7
* | x86: only compile floppy driver if CONFIG_ISA_DMA_API is enabledDavid Rientjes2011-03-221-1/+1
* | Merge branch 'x86-trampoline-for-linus' of git://git.kernel.org/pub/scm/linux...Linus Torvalds2011-03-161-4/+0
|\ \
| * | x86, trampoline: Common infrastructure for low memory trampolinesH. Peter Anvin2011-02-171-4/+0
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmo...Linus Torvalds2011-03-161-0/+5
|\ \ \
| * | | KEYS: Add an iovec version of KEYCTL_INSTANTIATEDavid Howells2011-03-081-0/+5
| |/ /
OpenPOWER on IntegriCloud