summaryrefslogtreecommitdiffstats
path: root/arch
Commit message (Expand)AuthorAgeFilesLines
*-----. Merge branches 'x86-efi-for-linus', 'x86-gart-for-linus', 'x86-irq-for-linus'...Linus Torvalds2011-05-198-86/+96
|\ \ \ \
| | | | * x86, mce: Drop the default decoding notifierBorislav Petkov2011-04-212-19/+7
| | | | * x86, MCE: Do not taint when handling correctable errorsBorislav Petkov2011-04-192-4/+0
| | | * | x86: Don't unmask disabled irqs when migrating themTian, Kevin2011-05-191-1/+2
| | | * | x86: Skip migrating IRQF_PER_CPU irqs in fixup_irqs()Tian, Kevin2011-05-191-1/+1
| | * | | x86, gart: Don't enforce GART aperture lower-bound by alignmentJoerg Roedel2011-04-181-15/+19
| * | | | x86, efi: Ensure that the entirity of a region is mappedMatthew Garrett2011-05-091-2/+4
| * | | | x86, efi: Pass a minimal map to SetVirtualAddressMap()Matthew Garrett2011-05-091-3/+11
| * | | | x86, efi: Merge contiguous memory regions of the same type and attributeMatthew Garrett2011-05-091-1/+29
| * | | | x86, efi: Consolidate EFI nx controlMatthew Garrett2011-05-093-28/+22
| * | | | x86, efi: Remove virtual-mode SetVirtualAddressMap callMatthew Garrett2011-05-091-12/+1
* | | | | Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2011-05-1913-203/+223
|\ \ \ \ \
| * | | | | x86, cpu: Fix detection of Celeron Covington stepping A1 and B0Ondrej Zary2011-05-161-6/+4
| * | | | | x86, AMD, cacheinfo: Fix L3 cache index disable checksFrank Arnold2011-05-161-15/+4
| * | | | | x86, AMD, cacheinfo: Fix fallout caused by max3 conversionBorislav Petkov2011-05-161-1/+0
| * | | | | x86, cpu: Change NOP selection for certain Intel CPUsH. Peter Anvin2011-04-181-1/+13
| * | | | | x86, cpu: Clean up and unify the NOP selection infrastructureH. Peter Anvin2011-04-186-161/+190
| * | | | | x86, percpu: Use ASM_NOP4 instead of hardcoding P6_NOP4H. Peter Anvin2011-04-181-1/+1
| * | | | | x86, cpu: Move AMD Elan Kconfig under "Processor family"Ian Campbell2011-04-085-21/+14
| | | | | |
| \ \ \ \ \
| \ \ \ \ \
| \ \ \ \ \
*---. \ \ \ \ \ Merge branches 'x86-apic-for-linus', 'x86-asm-for-linus' and 'x86-cleanups-fo...Linus Torvalds2011-05-195-35/+101
|\ \ \ \ \ \ \ \
| | | * | | | | | x86: Fix mrst sparse complaintsLuis R. Rodriguez2011-05-071-2/+2
| | | * | | | | | Merge commit 'v2.6.39-rc6' into x86/cleanupsIngo Molnar2011-05-071530-20283/+21695
| | | |\ \ \ \ \ \ | | | | | |/ / / / | | | | |/| | | |
| | | * | | | | | x86: Fix spelling error in the memcpy() source code commentBart Van Assche2011-05-011-1/+1
| | | * | | | | | x86, mpparse: Remove unnecessary variableRakib Mullick2011-03-241-3/+1
| | * | | | | | | x86: Demacro CONFIG_PARAVIRT cpu accessorsAvi Kivity2011-04-241-14/+71
| * | | | | | | | 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-192-61/+17
|\ \ \ \ \ \ \ \
| * | | | | | | | x86: hpet: Cleanup the clockevents init and register codeThomas Gleixner2011-05-191-56/+16
| * | | | | | | | x86: Convert PIT to clockevents_config_and_register()Thomas Gleixner2011-05-191-5/+1
* | | | | | | | | Merge branch 'timers-clocksource-for-linus' of git://git.kernel.org/pub/scm/l...Linus Torvalds2011-05-1931-341/+57
|\| | | | | | | |
| * | | | | | | | Merge branch 'consolidate-clksrc-i8253' of master.kernel.org:~rmk/linux-2.6-a...Thomas Gleixner2011-05-143179-52310/+107677
| |\ \ \ \ \ \ \ \
| | * | | | | | | | clocksource: convert mips to generic i8253 clocksourceRussell King2011-05-143-77/+7
| | * | | | | | | | clocksource: convert x86 to generic i8253 clocksourceRussell King2011-05-143-78/+4
| | * | | | | | | | clocksource: convert footbridge to generic i8253 clocksourceRussell King2011-05-143-41/+21
| * | | | | | | | | blackfin: convert to clocksource_register_hzJohn Stultz2011-02-211-33/+2
| * | | | | | | | | mips: convert to clocksource_register_hz/khzJohn Stultz2011-02-2113-66/+14
| * | | | | | | | | sparc: convert to clocksource_register_hz/khzJohn Stultz2011-02-211-3/+1
| * | | | | | | | | alpha: convert to clocksource_register_hzJohn Stultz2011-02-211-2/+1
| * | | | | | | | | microblaze: convert to clocksource_register_hz/khzJohn Stultz2011-02-211-5/+1
| * | | | | | | | | ia64: convert to clocksource_register_hz/khzJohn Stultz2011-02-213-17/+4
| * | | | | | | | | x86: Convert remaining x86 clocksources to clocksource_register_hz/khzJohn Stultz2011-02-216-32/+6
| | | | | | | | | |
| \ \ \ \ \ \ \ \ \
*-. \ \ \ \ \ \ \ \ \ Merge branches 'sched-core-for-linus' and 'sched-urgent-for-linus' of git://g...Linus Torvalds2011-05-1926-51/+66
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge commit 'v2.6.39-rc7' into sched/coreIngo Molnar2011-05-1281-561/+1319
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge commit 'v2.6.39-rc4' into sched/coreIngo Molnar2011-04-2164-150/+310
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch 'sched/locking' into sched/coreIngo Molnar2011-04-1839-113/+140
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | sched: Provide scheduler_ipi() callback in response to smp_send_reschedule()Peter Zijlstra2011-04-1425-50/+61
| * | | | | | | | | | | | sched, sparc64: Turn cpu_coregroup_mask() into a real functionStephen Rothwell2011-04-121-1/+5
* | | | | | | | | | | | | Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2011-05-1931-180/+416
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'x86/mem' into perf/coreIngo Molnar2011-05-1811-54/+219
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | x86, 64-bit: Fix copy_[to/from]_user() checks for the userspace address limitJiri Olsa2011-05-182-3/+3