summaryrefslogtreecommitdiffstats
path: root/arch/x86/Kconfig (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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-281-0/+1
* | Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/k...Linus Torvalds2011-05-201-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-201-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-201-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-201-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-201-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-201-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-201-1/+1
|/ /
* | Merge branch 'syscore' of git://git.kernel.org/pub/scm/linux/kernel/git/rafae...Linus Torvalds2011-03-261-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-241-0/+10
|/ /
* | x86: allow CONFIG_ISA_DMA_API to be disabledDavid Rientjes2011-03-231-3/+7
* | x86: only compile floppy driver if CONFIG_ISA_DMA_API is enabledDavid Rientjes2011-03-231-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-181-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
| |/ /
* | | Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/k...Linus Torvalds2011-03-161-17/+5
|\ \ \ | | |/ | |/|
| * | x86: Add device tree supportSebastian Andrzej Siewior2011-02-231-0/+2
| * | Merge branch 'x86/apic' into x86/platformThomas Gleixner2011-02-231-1/+1
| |\ \
| * | | x86: OLPC: Remove extra OLPC_OPENFIRMWARE_DT indirectionThomas Gleixner2011-02-231-5/+1
| * | | x86: OLPC: Cleanup config maze completelyThomas Gleixner2011-02-231-7/+3
| * | | x86: OLPC: Hide OLPC_OPENFIRMWARE config switchThomas Gleixner2011-02-231-8/+2
| * | | x86: OLPC: Remove redundant !X64_64 config dependencyThomas Gleixner2011-02-231-2/+2
| | |/ | |/|
* | | Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds2011-03-161-1/+1
|\ \ \
| * | | x86: Unify CPU -> NUMA node mapping between 32 and 64bitTejun Heo2011-01-281-1/+1
| |/ /
* | | Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2011-03-161-1/+3
|\ \ \
| * | | x86: Enable forced interrupt threading supportThomas Gleixner2011-03-121-0/+1
| * | | x86: Use generic show_interruptsThomas Gleixner2011-03-121-0/+1
| | |/ | |/|
| * | x86: Fix deps of X86_UP_IOAPICHenrik Kretzschmar2011-02-231-1/+1
| |/
* / x86: Remove dead config option X86_CPUJan Beulich2011-03-091-0/+2
|/
* kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERTDavid Rientjes2011-01-211-10/+10
*-. Merge branches 'core-fixes-for-linus', 'x86-fixes-for-linus', 'timers-fixes-f...Linus Torvalds2011-01-151-0/+1
|\ \
| | * x86, olpc: Add missing Kconfig dependenciesH. Peter Anvin2011-01-141-0/+1
| |/
* | Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jb...Linus Torvalds2011-01-141-2/+8
|\ \
| * | x86/PCI: make Broadcom CNB20LE driver EMBEDDED and EXPERIMENTALBjorn Helgaas2011-01-141-2/+8
* | | x86: OLPC: convert olpc-xo1 driver from pci device to platform deviceAndres Salomon2011-01-141-1/+1
* | | Merge branch 'x86-olpc-for-linus' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2011-01-131-0/+6
|\ \ \