summaryrefslogtreecommitdiffstats
path: root/arch/x86/Kconfig
Commit message (Expand)AuthorAgeFilesLines
*-. 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
| | * | | | | x86: Use memblock to replace early_resYinghai Lu2010-08-271-6/+3
| | | |/ / / | | |/| | |
| * | | | | Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2010-10-211-31/+4
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | x86: ioapic: Cleanup sparse irq codeThomas Gleixner2010-10-121-1/+0
| | * | | | x86: Use genirq KconfigThomas Gleixner2010-10-041-31/+5
| | | |/ / | | |/| |
| * | | | Merge branch 'x86-vmware-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2010-10-211-19/+0
| |\ \ \ \
| | * | | | x86, vmware: Remove deprecated VMI kernel supportAlok Kataria2010-08-231-19/+0
| | |/ / /
| * | | | Merge branch 'x86-olpc-for-linus' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2010-10-211-2/+9
| |\ \ \ \
| | * | | | x86, olpc: XO-1 uses/depends on PCIRandy Dunlap2010-10-151-1/+1
| | * | | | x86, olpc: Add XO-1 poweroff supportDaniel Drake2010-10-121-0/+6
| | * | | | x86, olpc: Rework BIOS signature checkDaniel Drake2010-09-231-1/+2
| | * | | | x86, olpc: Only enable PCI configuration type override on XO-1Daniel Drake2010-09-231-1/+1
| | |/ / /
| * | | | Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds2010-10-211-0/+3
| |\ \ \ \
| | * | | | x86, mm: Enable ARCH_DMA_ADDR_T_64BIT with X86_64 || HIGHMEM64GFUJITA Tomonori2010-10-201-0/+3
| | |/ / /
| * | | | Merge branch 'x86-bios-for-linus' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2010-10-211-19/+28
| |\ \ \ \
| | * | | | x86, bios: Make the x86 early memory reservation a kernel optionH. Peter Anvin2010-08-251-1/+1
| | * | | | x86, bios: By default, reserve the low 64K for all BIOSesH. Peter Anvin2010-08-241-19/+28
| | |/ / /
| * | | | Merge branch 'x86-amd-nb-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2010-10-211-2/+2
| |\ \ \ \
| | * | | | x86, k8: Rename k8.[ch] to amd_nb.[ch] and CONFIG_K8_NB to CONFIG_AMD_NBAndreas Herrmann2010-09-201-2/+2
| | |/ / /
| * | | | Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2010-10-211-0/+11
| |\ \ \ \
| | * | | | x86: Add IRQ_TIME_ACCOUNTINGVenkatesh Pallipadi2010-10-181-0/+11
| | |/ / /
| * | | | irq_work: Add generic hardirq context callbacksPeter Zijlstra2010-10-181-0/+1
| * | | | ftrace: Rename config option HAVE_C_MCOUNT_RECORD to HAVE_C_RECORDMCOUNTSteven Rostedt2010-10-141-1/+1
OpenPOWER on IntegriCloud