summaryrefslogtreecommitdiffstats
path: root/arch/x86/Kconfig
Commit message (Expand)AuthorAgeFilesLines
* 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
| |/
* | Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/k...Linus Torvalds2011-03-151-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-151-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-151-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-201-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
|\ \ \
| * | | x86, olpc: Add OLPC device-tree supportAndres Salomon2010-12-151-0/+6
| |/ /
* | | x86: support XZ-compressed kernelLasse Collin2011-01-131-0/+1
* | | kernel: clean up USE_GENERIC_SMP_HELPERSAmerigo Wang2011-01-131-4/+1
| |/ |/|
* | Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/k...Linus Torvalds2011-01-061-0/+29
|\ \
| * | x86/platform: Add Eurobraille/Iris power off supportShérab2010-11-181-0/+13
| * | x86, mrst: Fix dependencies of "select INTEL_SCU_IPC"Randy Dunlap2010-11-171-0/+1
| * | x86, mrst: The shutdown for MRST requires the SCU IPC mechanismAlan Cox2010-11-171-0/+1
| * | x86: Ce4100: Add reboot_fixup() for CE4100Dirk Brandewie2010-11-121-0/+1
| * | x86: Add CE4100 platform supportThomas Gleixner2010-11-121-0/+11
| * | x86/mrst: Add SFI platform device parsing codeFeng Tang2010-11-091-0/+2
* | | Merge branch 'x86-amd-nb-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2011-01-061-6/+6
|\ \ \ | |_|/ |/| |
| * | x86, amd-nb: Complete the rename of AMD NB and related codeHans Rosenfeld2010-11-181-6/+6
| |/
* | perf, x86: Fixup Kconfig depsPeter Zijlstra2010-11-261-1/+1
|/
* Merge branch 'stable/xen-pcifront-0.8.2' of git://git.kernel.org/pub/scm/linu...Linus Torvalds2010-10-281-0/+5
|\
| * xen/x86/PCI: Add support for the Xen PCI subsystemAlex Nixon2010-10-181-0/+5
* | Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmare...Linus Torvalds2010-10-281-3/+0
|\ \
| * \ Merge branch 'kbuild/rc-fixes' into kbuild/kconfigMichal Marek2010-10-121-4/+11
| |\ \
| * | | kbuild: migrate all arch to the kconfig mainmenu upgradeArnaud Lacombe2010-09-191-3/+0
* | | | Merge branch 'linus' into x86/urgentIngo Molnar2010-10-251-82/+63
|\ \ \ \
| * \ \ \ Merge branch 'core-memblock-for-linus' of git://git.kernel.org/pub/scm/linux/...Linus Torvalds2010-10-211-13/+2
| |\ \ \ \
| | * \ \ \ Merge commit 'v2.6.36-rc3' into x86/memblockIngo Molnar2010-08-311-6/+18
| | |\ \ \ \
| | * | | | | x86: Remove old bootmem codeYinghai Lu2010-08-271-9/+1
OpenPOWER on IntegriCloud