summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm
Commit message (Expand)AuthorAgeFilesLines
*-. Merge branches 'tracing/ftrace', 'tracing/markers', 'tracing/mmiotrace', 'tra...Ingo Molnar2008-11-031-0/+15
|\ \
| | * ftrace: nmi safe code clean upsSteven Rostedt2008-10-311-5/+5
| | * ftrace: nmi safe code modificationSteven Rostedt2008-10-301-0/+15
* | | x86: fix AMDC1E and XTOPOLOGY conflict in cpufeatureVenki Pallipadi2008-10-311-1/+1
* | | Merge branch 'x86-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds2008-10-304-5/+12
|\ \ \
| * | | x86/voyager: fix compile breakage caused by dc1e35c6e95e8923cf1d3510438b63c60...James Bottomley2008-10-311-0/+6
| * | | x86, uv: fix compile error in uv_hub.hMike Travis2008-10-301-0/+1
| * | | i386/PAE: fix pud_page()Jan Beulich2008-10-301-2/+2
| * | | x86: start annotating early ioremap pointers with __iomemHarvey Harrison2008-10-291-3/+3
* | | | Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2008-10-302-10/+8
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | x86: fix APIC_DEBUG with inquire_remote_apicYinghai Lu2008-10-282-10/+8
| |/
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jba...Linus Torvalds2008-10-301-1/+0
|\ \
| * | x86/PCI: build failure at x86/kernel/pci-dma.c with !CONFIG_PCIFenghua Yu2008-10-241-1/+0
| |/
* | Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/...Linus Torvalds2008-10-281-2/+2
|\ \
| * | Merge commit 'v2.6.28-rc2' into tracing/urgentIngo Molnar2008-10-271-2/+2
| |/
* | Merge branch 'kvm-updates/2.6.28' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2008-10-281-0/+3
|\ \
| * | KVM: Fix guest shared interrupt with in-kernel irqchipSheng Yang2008-10-281-0/+3
| |/
* | Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2008-10-281-1/+3
|\ \ | |/ |/|
| * x86: use GFP_DMA for 24bit coherent_dma_maskFUJITA Tomonori2008-10-231-1/+3
* | Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2008-10-231-52/+54
|/
* Merge branch 'proc' of git://git.kernel.org/pub/scm/linux/kernel/git/adobriya...Linus Torvalds2008-10-231-1/+2
* Merge branch 'x86/um-header' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2008-10-232-0/+5
* x86: canonicalize remaining header guardsH. Peter Anvin2008-10-233-8/+8
* x86: drop double underscores from header guardsH. Peter Anvin2008-10-2332-96/+96
* x86: Fix ASM_X86__ header guardsH. Peter Anvin2008-10-22267-799/+799
* x86, um: ... and asm-x86 moveAl Viro2008-10-22333-0/+38672
OpenPOWER on IntegriCloud