summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2011-05-206-113/+126
|\
| * x86, cpu: Fix detection of Celeron Covington stepping A1 and B0Ondrej Zary2011-05-161-6/+4Star
| * x86, AMD, cacheinfo: Fix L3 cache index disable checksFrank Arnold2011-05-161-15/+4Star
| * x86, AMD, cacheinfo: Fix fallout caused by max3 conversionBorislav Petkov2011-05-161-1/+0Star
| * x86, cpu: Change NOP selection for certain Intel CPUsH. Peter Anvin2011-04-191-1/+13
| * x86, cpu: Clean up and unify the NOP selection infrastructureH. Peter Anvin2011-04-194-91/+106
| * x86, cpu: Move AMD Elan Kconfig under "Processor family"Ian Campbell2011-04-081-2/+2
| |
| \
| \
| \
*---. \ Merge branches 'x86-apic-for-linus', 'x86-asm-for-linus' and 'x86-cleanups-fo...Linus Torvalds2011-05-202-18/+27
|\ \ \ \
| | | * \ Merge commit 'v2.6.39-rc6' into x86/cleanupsIngo Molnar2011-05-0735-310/+338
| | | |\ \
| | | * | | x86, mpparse: Remove unnecessary variableRakib Mullick2011-03-241-3/+1Star
| * | | | | x86, apic: Print verbose error interrupt reason on apic=debugYouquan Song2011-04-191-15/+26
* | | | | | Merge branch 'timers-clockevents-for-linus' of git://git.kernel.org/pub/scm/l...Linus Torvalds2011-05-202-61/+17Star
|\ \ \ \ \ \
| * | | | | | x86: hpet: Cleanup the clockevents init and register codeThomas Gleixner2011-05-191-56/+16Star
| * | | | | | x86: Convert PIT to clockevents_config_and_register()Thomas Gleixner2011-05-191-5/+1Star
* | | | | | | Merge branch 'timers-clocksource-for-linus' of git://git.kernel.org/pub/scm/l...Linus Torvalds2011-05-203-93/+3Star
|\| | | | | |
| * | | | | | Merge branch 'consolidate-clksrc-i8253' of master.kernel.org:~rmk/linux-2.6-a...Thomas Gleixner2011-05-14110-1908/+2958
| |\ \ \ \ \ \
| | * | | | | | clocksource: convert x86 to generic i8253 clocksourceRussell King2011-05-141-78/+1Star
| * | | | | | | x86: Convert remaining x86 clocksources to clocksource_register_hz/khzJohn Stultz2011-02-213-19/+3Star
| | | | | | | |
| \ \ \ \ \ \ \
*-. \ \ \ \ \ \ \ Merge branches 'sched-core-for-linus' and 'sched-urgent-for-linus' of git://g...Linus Torvalds2011-05-201-3/+2Star
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge commit 'v2.6.39-rc7' into sched/coreIngo Molnar2011-05-1213-103/+186
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge commit 'v2.6.39-rc4' into sched/coreIngo Molnar2011-04-212-0/+42
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| * | | | | | | | | sched: Provide scheduler_ipi() callback in response to smp_send_reschedule()Peter Zijlstra2011-04-141-3/+2Star
* | | | | | | | | | Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2011-05-2010-73/+76
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'x86/mem' into perf/coreIngo Molnar2011-05-183-6/+25
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | x86, alternative, doc: Add comment for applying alternatives orderFenghua Yu2011-05-181-0/+9
| | * | | | | | | | | | x86, mem, intel: Initialize Enhanced REP MOVSB/STOSBFenghua Yu2011-05-181-4/+15
| | * | | | | | | | | | x86, cpufeature: Fix cpuid leaf 7 feature detectionFenghua Yu2011-05-171-2/+1Star
| | | |_|/ / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | x86: Remove warning and warning_symbol from struct stacktrace_opsRichard Weinberger2011-05-123-42/+0Star
| * | | | | | | | | | Merge commit 'v2.6.39-rc7' into perf/coreIngo Molnar2011-05-106-58/+91
| |\| | | | | | | | |
| * | | | | | | | | | Merge branch 'perf/stat' into perf/coreIngo Molnar2011-05-062-16/+29
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | perf events, x86: Add Westmere stalled-cycles-frontend/backend eventsIngo Molnar2011-04-291-0/+6
| | * | | | | | | | | | perf, x86: Add new stalled cycles events for Intel and AMD CPUsIngo Molnar2011-04-292-7/+11
| | * | | | | | | | | | perf events: Add generic front-end and back-end stalled cycle event definitionsIngo Molnar2011-04-291-1/+1
| | * | | | | | | | | | perf event, x86: Use better stalled cycles metricIngo Molnar2011-04-281-2/+2
| | * | | | | | | | | | perf events, x86: Mark constrant tables read mostlyIngo Molnar2011-04-261-10/+10
| | * | | | | | | | | | perf events: Add stalled cycles generic event - PERF_COUNT_HW_STALLED_CYCLESIngo Molnar2011-04-261-0/+3
| | * | | | | | | | | | Merge branch 'perf/urgent' into perf/statIngo Molnar2011-04-264-10/+35
| | |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | perf events, x86: Add SandyBridge stalled-cycles-frontend/backend eventsLin Ming2011-05-061-0/+6
| * | | | | | | | | | | | Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/g...Ingo Molnar2011-05-014-16/+68
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git...Ingo Molnar2011-04-272-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | jump label: Introduce static_branch() interfaceJason Baron2011-04-042-1/+2
| * | | | | | | | | | | | | perf events, x86, P4: Fix typo in commentJustin P. Mattock2011-04-241-1/+1
| * | | | | | | | | | | | | perf, x86: P4 PMU -- Use perf_sample_data_init helperCyrill Gorcunov2011-04-221-2/+1Star
| * | | | | | | | | | | | | Merge branch 'linus' into perf/coreIngo Molnar2011-04-224-6/+46
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | perf, x86: Use ALTERNATIVE() to check for X86_FEATURE_PERFCTR_CORERobert Richter2011-04-191-4/+11
| * | | | | | | | | | | | | | Merge branch 'perf/urgent' into perf/coreIngo Molnar2011-04-1910-8/+37
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / | |/| | | | | / / / / / / / / | | | |_|_|_|/ / / / / / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | perf, x86: P4 PMU - clean up the code a bitCyrill Gorcunov2011-03-291-1/+1
* | | | | | | | | | | | | | Merge branch 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2011-05-205-241/+353
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'gart/rename' of git://git.kernel.org/pub/scm/linux/kernel/git/j...Ingo Molnar2011-05-172-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | x86, gart: Rename pci-gart_64.c to amd_gart_64.cJoerg Roedel2011-05-102-1/+1
| | | |_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | |