aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/Makefile
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'kvm-3.7-1' of git://git.kernel.org/pub/scm/virt/kvm/kvmLinus Torvalds2012-10-041-2/+1
|\
| * x86: KVM guest: merge CONFIG_KVM_CLOCK into CONFIG_KVM_GUESTMarcelo Tosatti2012-08-231-2/+1
* | perf: Unified API to record selective sets of arch registersJiri Olsa2012-08-101-0/+2
|/
* Merge branch 'x86-trampoline-for-linus' of git://git.kernel.org/pub/scm/linux...Linus Torvalds2012-05-291-2/+0
|\
| * x86, realmode: Move kernel/realmode.c to realmode/init.cH. Peter Anvin2012-05-161-1/+0
| * x86, realmode: Move ACPI wakeup to unified realmode codeJarkko Sakkinen2012-05-081-1/+0
| * x86, realmode: Move reboot_32.S to unified realmode codeJarkko Sakkinen2012-05-081-1/+0
| * x86, realmode: Relocator for realmode codeJarkko Sakkinen2012-05-081-0/+1
* | Merge branch 'perf-uprobes-for-linus' of git://git.kernel.org/pub/scm/linux/k...Linus Torvalds2012-05-241-0/+1
|\ \
| * \ Merge branch 'perf/core' into perf/uprobesIngo Molnar2012-04-141-0/+1
| |\ \ | | |/
| * | uprobes, mm, x86: Add the ability to install and remove uprobes breakpointsSrikar Dronamraju2012-02-171-0/+1
* | | Merge branch 'delete-mca' of git://git.kernel.org/pub/scm/linux/kernel/git/pa...Linus Torvalds2012-05-231-1/+0
|\ \ \
| * | | MCA: delete all remaining traces of microchannel bus support.Paul Gortmaker2012-05-171-1/+0
| | |/ | |/|
* | | x86: Use generic init_taskThomas Gleixner2012-05-051-1/+1
|/ /
* | x86/kprobes: Split out optprobe related code to kprobes-opt.cMasami Hiramatsu2012-03-061-0/+1
|/
* Merge branch 'x86-syscall-for-linus' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds2012-01-161-1/+2
|\
| * x86: Generate system call tables and unistd_*.h from tablesH. Peter Anvin2011-11-171-1/+2
* | x86, NMI: Add NMI IPI selftestDon Zickus2011-12-051-0/+1
|/
* x86, nmi: Split out nmi from traps.cDon Zickus2011-10-101-1/+1
* Merge branch 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2011-08-121-13/+0
|\
| * x86: Remove unnecessary compile flag tweaks for vsyscall codeAndy Lutomirski2011-08-101-13/+0
* | Merge branch 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2011-07-221-6/+2
|\ \ | |/
| * x86-64: Move vread_tsc and vread_hpet into the vDSOAndy Lutomirski2011-07-141-6/+1
| * x86-64: Emulate legacy vsyscallsAndy Lutomirski2011-06-071-0/+1
* | iommu/amd: Move missing parts to drivers/iommuJoerg Roedel2011-06-211-1/+0
* | x86: amd_iommu: move to drivers/iommu/Ohad Ben-Cohen2011-06-211-1/+1
|/
* x86: Put back -pg to tsc.o and add no GCOV to vread_tsc_64.oSteven Rostedt2011-05-271-0/+2
* x86-64: Move vread_tsc into a new file with sensible optionsAndy Lutomirski2011-05-241-3/+5
* Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/k...Linus Torvalds2011-05-191-1/+1
|\
| * x86: Introduce pci_map_biosrom()Dan Williams2011-03-151-1/+1
* | x86, gart: Rename pci-gart_64.c to amd_gart_64.cJoerg Roedel2011-05-101-1/+1
* | x86: only compile 8237A if CONFIG_ISA_DMA_API is enabledDavid Rientjes2011-03-221-1/+2
* | Merge branch 'x86-trampoline-for-linus' of git://git.kernel.org/pub/scm/linux...Linus Torvalds2011-03-161-2/+2
|\ \ | |/ |/|
| * x86, reboot: Move the real-mode reboot code to an assembly fileH. Peter Anvin2011-02-171-0/+1
| * x86, trampoline: Common infrastructure for low memory trampolinesH. Peter Anvin2011-02-171-2/+1
* | x86: Remove superflous goal definition of tsc_syncHenrik Kretzschmar2011-03-111-2/+2
* | x86: Add device tree supportSebastian Andrzej Siewior2011-02-231-0/+1
|/
* Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/k...Linus Torvalds2011-01-061-1/+0
|\
| * x86, earlyprintk: Move mrst early console to platform/ and fix a typoFeng Tang2010-12-061-1/+0
| * x86: platform: Move iris to x86/platform where it belongsThomas Gleixner2010-11-201-1/+0
| * x86/platform: Add Eurobraille/Iris power off supportShérab2010-11-181-0/+1
* | x86: avoid low BIOS area when allocating address spaceBjorn Helgaas2010-12-171-0/+1
|/
* x86: Move olpc to platformThomas Gleixner2010-10-271-4/+0
* x86: Move uv to platformThomas Gleixner2010-10-271-1/+0
* x86: Move mrst to platformThomas Gleixner2010-10-271-1/+0
* x86: Move scx200 to platformThomas Gleixner2010-10-271-3/+0
* x86: Move visws to platformThomas Gleixner2010-10-271-1/+0
* x86: Move efi to platformThomas Gleixner2010-10-271-1/+0
* x86: Move sfi to platformThomas Gleixner2010-10-271-1/+0
* Merge branch 'x86-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2010-10-211-0/+1
|\