summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/Makefile
Commit message (Expand)AuthorAgeFilesLines
* ftrace: fix merge bugletIngo Molnar2008-07-171-2/+1
* Merge branch 'auto-ftrace-next' into tracing/for-linusIngo Molnar2008-07-141-0/+8
|\
| * Merge branch 'linus' into tracing/ftraceIngo Molnar2008-06-251-0/+1
| |\
| * | ftrace: use the new kbuild CFLAGS_REMOVE for x86/kernel directorySteven Rostedt2008-05-231-0/+7
| * | ftrace: dynamic enabling/disabling of function callsSteven Rostedt2008-05-231-0/+1
* | | Merge branch 'x86/generalize-visws' into x86/coreIngo Molnar2008-07-111-0/+1
|\ \ \
| * | | x86, VisWS: turn into generic arch, clean upIngo Molnar2008-07-101-1/+1
| * | | x86, VisWS: turn into generic arch, clean upIngo Molnar2008-07-101-1/+1
| * | | x86, VisWS: turn into generic arch, flip over VISWS to generic archIngo Molnar2008-07-101-0/+1
* | | | x86: fix tsc unification buglet with ftrace and stackprotectorIngo Molnar2008-07-111-1/+1
|/ / /
* | | x86: merge tsc_init and clocksource codeAlok Kataria2008-07-091-1/+1
* | | x86: merge sched_clock handlingAlok Kataria2008-07-091-1/+1
* | | x86: remove acpi_srat config v2Yinghai Lu2008-07-081-1/+0
* | | x86: rename setup_32.c to setup.cYinghai Lu2008-07-081-1/+1
* | | x86: rename setup.c to setup_percpu.cYinghai Lu2008-07-081-1/+1
* | | x86: merge setup64.c into common_64.cYinghai Lu2008-07-081-1/+1
* | | x86: seperate probe_roms into another fileYinghai Lu2008-07-081-0/+1
* | | Merge branch 'x86/uv' into x86/develIngo Molnar2008-07-081-1/+1
|\ \ \
| * | | x86, SGI UV: TLB shootdown using broadcast assist unitCliff Wickman2008-07-081-1/+1
| * | | Merge branch 'linus' into x86/irqIngo Molnar2008-06-251-0/+1
| |\ \ \ | | | |/ | | |/|
| * | | x86: rename the i8259_32/64.c leftovers to irqinit_32/64.cThomas Gleixner2008-05-241-1/+1
| * | | x86: automatical unification of i8259.cPavel Machek2008-05-241-1/+1
| | |/ | |/|
* | | Merge branch 'x86/nmi' into x86/develIngo Molnar2008-07-081-1/+1
|\ \ \
| * \ \ Merge branch 'linus' into x86/nmiIngo Molnar2008-06-251-0/+1
| |\ \ \ | | | |/ | | |/|
| * | | x86: nmi_32/64.c - merge down nmi_32.c and nmi_64.c to nmi.cCyrill Gorcunov2008-05-251-1/+1
| | |/ | |/|
* | | Merge branch 'x86/mpparse' into x86/develIngo Molnar2008-07-081-2/+2
|\ \ \
| * | | x86: merge setup_memory_map with e820Yinghai Lu2008-07-081-1/+1
| * | | Merge branch 'linus' into tmp.x86.mpparse.newIngo Molnar2008-07-081-0/+1
| |\ \ \ | | | |/ | | |/|
| * | | x86: extract common part of head32.c and head64.c into head.cHuang, Ying2008-06-051-1/+1
| * | | x86: make e820.c to have common functionsYinghai Lu2008-05-251-1/+1
| | |/ | |/|
| | |
| \ \
| \ \
| \ \
*---. \ \ Merge branches 'x86/mmio', 'x86/delay', 'x86/idle', 'x86/oprofile', 'x86/debu...Ingo Molnar2008-07-081-0/+1
|\ \ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/|
| | | * x86, AMD IOMMU: add amd_iommu.c to MakefileJoerg Roedel2008-06-271-1/+1
| | | * x86, AMD IOMMU: add amd_iommu_init.c to MakefileJoerg Roedel2008-06-271-0/+1
| | |/
| | |
| \ \
| \ \
| \ \
*---. \ \ Merge branches 'x86/numa-fixes', 'x86/apic', 'x86/apm', 'x86/bitops', 'x86/bu...Ingo Molnar2008-07-081-2/+2
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| |
| | | * Merge branch 'linus' into x86/i8259Ingo Molnar2008-06-251-0/+1
| | | |\ | | |_|/ | |/| |
| | | * x86: rename the i8259_32/64.c leftovers to initirq_32/64.cThomas Gleixner2008-05-241-1/+1
| | | * x86: automatical unification of i8259.cPavel Machek2008-05-241-1/+1
| |_|/ |/| |
| | * Merge commit 'v2.6.26-rc9' into x86/cpuIngo Molnar2008-07-081-0/+1
| | |\ | | |/ | |/|
| | * x86: move bugs_64.c to cpu/bugs_64.cHiroshi Shimamoto2008-06-031-1/+0
| |/ |/|
| * x86: Add structs and functions for paravirt clocksourceGerd Hoffmann2008-06-241-0/+1
|/
* pcspkr: fix dependanciesStas Sergeev2008-05-071-3/+1
* x86 VISWS: build fixIngo Molnar2008-04-301-1/+0
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86...Linus Torvalds2008-04-291-0/+2
|\
| * x86: seperate mmconf for fam10h out from setup_64.cYinghai Lu2008-04-261-0/+2
* | x86: olpc: add One Laptop Per Child architecture supportAndres Salomon2008-04-291-0/+2
* | x86: KVM guest: add basic paravirt supportMarcelo Tosatti2008-04-271-0/+1
* | x86: KVM guest: paravirtualized clocksourceGlauber de Oliveira Costa2008-04-271-0/+1
|/
* x86: integrate pci-dma.cGlauber Costa2008-04-191-1/+1
* x86: unify pci-nommuGlauber Costa2008-04-191-3/+2
* x86: introduce pci-dma.cGlauber Costa2008-04-191-1/+1
OpenPOWER on IntegriCloud