aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/Kconfig
Commit message (Expand)AuthorAge
* Merge branch 'apei' into apei-releaseLen Brown2011-08-03
|\
| * Add Kconfig option ARCH_HAVE_NMI_SAFE_CMPXCHGHuang Ying2011-08-03
* | Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jb...Linus Torvalds2011-07-30
|\ \
| * | x86/PCI: select direct access mode for mmconfig optionShaohua Li2011-07-22
| |/
* | Merge branch 'x86-olpc-for-linus' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2011-07-26
|\ \
| * | x86, olpc: Fix dependency on POWER_SUPPLYDaniel Drake2011-07-24
| * | x86, olpc: Add XO-1.5 SCI driverDaniel Drake2011-07-06
| * | x86, olpc: Add XO-1 RTC driverDaniel Drake2011-07-06
| * | x86, olpc-xo1-sci: Propagate power supply/battery eventsDaniel Drake2011-07-06
| * | x86, olpc-xo1-sci: Add lid switch functionalityDaniel Drake2011-07-06
| * | x86, olpc-xo1-sci: Add GPE handler and ebook switch functionalityDaniel Drake2011-07-06
| * | x86, olpc: Add XO-1 SCI driver and power button controlDaniel Drake2011-07-06
| * | x86, olpc: Add XO-1 suspend/resume supportDaniel Drake2011-07-06
| * | x86, olpc: Rename olpc-xo1 to olpc-xo1-pmDaniel Drake2011-07-06
| |/
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2011-07-25
|\ \
| * | doc: Konfig: Documentation/power/{pm => apm-acpi}.txtMichael Witten2011-07-11
| |/
* | Merge branch 'kvm-updates/3.1' of git://git.kernel.org/pub/scm/virt/kvm/kvmLinus Torvalds2011-07-24
|\ \
| * | sched: adjust scheduler cpu power for stolen timeGlauber Costa2011-07-14
| |/
| |
| \
| \
| \
*---. \ Merge branches 'x86-detect-hyper-for-linus', 'x86-fpu-for-linus', 'x86-kexec-...Linus Torvalds2011-07-23
|\ \ \ \ | | |_|/ | |/| |
| | | * x86, config: Introduce an INTEL_MID configurationAlan Cox2011-07-21
| | |/
* | | Merge branch 'timers-clocksource-for-linus' of git://git.kernel.org/pub/scm/l...Linus Torvalds2011-07-23
|\ \ \
| * | | clocksource: apb: Share APB timer code with other platformsJamie Iles2011-06-27
| |/ /
* | | Merge branch 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2011-07-22
|\ \ \
| * | | clocksource: Change __ARCH_HAS_CLOCKSOURCE_DATA to a CONFIG optionH. Peter Anvin2011-07-21
| |/ /
* | | Merge branch 'timers-cleanup-for-linus' of git://git.kernel.org/pub/scm/linux...Linus Torvalds2011-07-22
|\ \ \
| * | | x86: Use common i8253 clockeventThomas Gleixner2011-07-01
| * | | pcspkr: Cleanup Kconfig dependenciesRalf Baechle2011-06-09
| * | | i8253: Consolidate all kernel definitions of i8253_lockRalf Baechle2011-06-09
| |/ /
* | | Merge branch 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2011-07-22
|\ \ \ | |_|/ |/| |
| * | x86/ia64: intel-iommu: move to drivers/iommu/Ohad Ben-Cohen2011-06-21
| * | x86: amd_iommu: move to drivers/iommu/Ohad Ben-Cohen2011-06-21
| * | drivers: iommu: move to a dedicated folderOhad Ben-Cohen2011-06-14
| |/
* / x86: Disable AMD_NUMA for 32bit for nowTejun Heo2011-07-11
|/
* arch: remove CONFIG_GENERIC_FIND_{NEXT_BIT,BIT_LE,LAST_BIT}Akinobu Mita2011-05-26
* Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds2011-05-25
|\
| * i8k: Integrate with the hwmon subsystemJean Delvare2011-05-25
* | x86: remove 32-bit versions of readq()/writeq()Roland Dreier2011-05-25
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6Linus Torvalds2011-05-20
|\
| * x86/net: only select BPF_JIT when NET is enabledRandy Dunlap2011-05-04
| * net: filter: Just In Time compiler for x86-64Eric Dumazet2011-04-28
* | Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/k...Linus Torvalds2011-05-19
|\ \
| * | x86, olpc: Use device tree for platform identificationDaniel Drake2011-03-15
* | | Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds2011-05-19
|\ \ \
| * | | x86, mm: Allow ZONE_DMA to be configurableDavid Rientjes2011-05-16
| * | | x86, NUMA: Enable emulation on 32bit tooTejun Heo2011-05-02
| * | | x86, NUMA: Enable CONFIG_AMD_NUMA on 32bit tooTejun Heo2011-05-02
| * | | x86: Clean up memory model related configs in arch/x86/KconfigTejun Heo2011-04-01
| * | | x86-64, NUMA: Remove custom phys_to_nid() implementationTejun Heo2011-04-01
| | |/ | |/|
* | | Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2011-05-19
|\ \ \
| * | | x86, cpu: Move AMD Elan Kconfig under "Processor family"Ian Campbell2011-04-08
| |/ /