summaryrefslogtreecommitdiffstats
path: root/arch/x86/Kconfig
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/k...Linus Torvalds2012-03-221-21/+7
|\
| * Merge tag 'v3.3-rc7' into x86/platformIngo Molnar2012-03-141-1/+0
| |\
| * | x86/geode/net5501: Add platform driver for Soekris Engineering net5501Philip Prindeville2012-03-061-0/+6
| * | x86/config: Select MSIC MFD driver on Intel Medfield platformMika Westerberg2012-01-261-0/+1
| * | x86/mid: Remove Intel MoorestownAlan Cox2012-01-261-21/+0
* | | Merge tag 'irqdomain-for-linus' of git://git.secretlab.ca/git/linux-2.6Linus Torvalds2012-03-211-0/+2
|\ \ \
| * | | irq_domain/x86: Convert x86 (embedded) to use common irq_domainGrant Likely2012-02-231-0/+2
| | |/ | |/|
* | | Merge tag 'driver-core-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2012-03-201-0/+3
|\ \ \
| * \ \ Merge 3.3-rc2 into the driver-core-next branch.Greg Kroah-Hartman2012-02-021-1/+0
| |\ \ \ | | |/ /
| * | | CPU: Introduce ARCH_HAS_CPU_AUTOPROBE and X86 partsThomas Renninger2012-01-261-0/+3
| | |/ | |/|
* | | vfs: use 'unsigned long' accesses for dcache name comparison and hashingLinus Torvalds2012-03-081-0/+1
| |/ |/|
* | x86/numachip: Drop unnecessary conflict with EDACDaniel J Blueman2012-01-261-1/+0
|/
* Merge remote-tracking branch 'linus/master' into x86/urgentH. Peter Anvin2012-01-191-8/+40
|\
| * mm,x86,um: move CMPXCHG_DOUBLE config optionHeiko Carstens2012-01-121-0/+1
| * mm,x86,um: move CMPXCHG_LOCAL config optionHeiko Carstens2012-01-121-0/+1
| * mm,slub,x86: decouple size of struct page from CONFIG_CMPXCHG_LOCALHeiko Carstens2012-01-121-0/+1
| * Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/k...Linus Torvalds2012-01-111-4/+27
| |\
| | * x86/intel config: Fix the APB_TIMER selectionAlan Cox2011-12-291-2/+6
| | * Merge commit 'v3.2-rc6' into x86/platformIngo Molnar2011-12-181-2/+6
| | |\
| | * | x86/intel config: Revamp configuration to allow for Moorestown and MedfieldAlan Cox2011-12-181-2/+2
| | * | x86/apb: Fix configuration constraintsAlan Cox2011-12-181-0/+1
| | * | x86: Fix INTEL_MID sillyAlan Cox2011-12-161-0/+1
| | * | x86/Kconfig: Cyclone-timer depends on x86-summitAlessandro Rubini2011-12-051-1/+1
| | * | x86/config: Revamp configuration for MID devicesAlan Cox2011-12-051-0/+17
| * | | Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2012-01-111-0/+7
| |\ \ \
| | * | | x86, efi: EFI boot stub supportMatt Fleming2011-12-121-0/+7
| | | |/ | | |/|
| * | | Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhostLinus Torvalds2012-01-101-3/+1
| |\ \ \
| | * | | lib: move GENERIC_IOMAP to lib/KconfigMichael S. Tsirkin2011-11-241-3/+1
| | | |/ | | |/|
| * | | fs: binfmt_elf: create Kconfig variable for PIE randomizationDavid Daney2012-01-101-0/+1
| * | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2012-01-081-1/+1
| |\ \ \
| | * | | x86: Kconfig: drop unknown symbol 'APM_MODULE'Paul Bolle2011-11-221-1/+1
* | | | | x86/kconfig: Move the ZONE_DMA entry under a menuRandy Dunlap2012-01-171-10/+10
|/ / / /
* | | | Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2012-01-061-0/+13
|\ \ \ \
| * | | | x86: Add NumaChip supportSteffen Persvold2011-12-051-0/+13
| | |/ / | |/| |
* | | | Merge branch 'memblock-kill-early_node_map' of git://git.kernel.org/pub/scm/l...Ingo Molnar2011-12-201-3/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | memblock: Kill early_node_map[]Tejun Heo2011-12-081-3/+0
| * | | Merge branch 'master' into x86/memblockTejun Heo2011-11-281-96/+103
| |\ \ \ | | |/ /
| * | | memblock, x86: Make ARCH_DISCARD_MEMBLOCK a config optionTejun Heo2011-07-141-0/+1
| * | | x86: Use HAVE_MEMBLOCK_NODE_MAPTejun Heo2011-07-141-0/+1
* | | | x86/intel_mid: Kconfig select fixAlan Cox2011-12-061-0/+3
* | | | x86/intel_mid: Fix the Kconfig for MID selectionAlan Cox2011-12-061-2/+3
| |/ / |/| |
* | | Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmare...Linus Torvalds2011-11-061-3/+0
|\ \ \
| * | | x86: drop unused Kconfig symbolPaul Bolle2011-10-311-3/+0
| | |/ | |/|
* | | Merge branch 'x86-rdrand-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2011-10-281-0/+9
|\ \ \
| * | | x86, random: Architectural inlines to get random integers with RDRANDH. Peter Anvin2011-07-311-0/+9
* | | | Merge branch 'x86-geode-for-linus' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2011-10-281-0/+14
|\ \ \ \
| * | | | x86: geode: New PCEngines Alix system driverEd Wildgoose2011-09-211-0/+14
| | |/ / | |/| |
* | | | Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2011-10-261-0/+1
|\ \ \ \
| * | | | x86/irq: Standardize on CONFIG_SPARSE_IRQ=yYinghai Lu2011-10-131-0/+1
| |/ / /
* | | | Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds2011-10-261-0/+1
|\ \ \ \
OpenPOWER on IntegriCloud