summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'x86-ras-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2013-09-0420-135/+523
|\
| * Merge tag 'edac_fixes_for_3.12' of git://git.kernel.org/pub/scm/linux/kernel/...Ingo Molnar2013-08-281-9/+10
| |\
| | * amd64_edac: Fix incorrect wraparoundsAravind Gopalakrishnan2013-08-271-5/+6
| | * amd64_edac: Correct erratum 505 rangeBorislav Petkov2013-08-271-4/+4
| |/
| * Merge tag 'edac_for_3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/bp...Ingo Molnar2013-08-155-8/+15
| |\
| | * cpc925_edac: Use proper array terminationJingoo Han2013-08-141-1/+1
| | * x38_edac: Make a local function staticJingoo Han2013-08-091-2/+1
| | * i3200_edac: Make a local function staticJingoo Han2013-08-091-2/+1
| | * amd64_edac: Fix single-channel setupsBorislav Petkov2013-07-291-1/+8
| | * EDAC: Replace strict_strtol() with kstrtol()Jingoo Han2013-07-241-2/+4
| * | Merge tag 'amd_f15_m30' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/b...Ingo Molnar2013-08-14192-1220/+2172
| |\ \
| | * | amd64_edac: Get rid of boot_cpu_data accessesBorislav Petkov2013-08-122-48/+46
| | * | amd64_edac: Add ECC decoding support for newer F15h modelsAravind Gopalakrishnan2013-08-122-34/+270
| | * | x86, amd_nb: Clarify F15h, model 30h GART and L3 supportAravind Gopalakrishnan2013-08-121-2/+11
| | * | pci_ids: Add PCI device ID functions 3 and 4 for newer F15h models.Aravind Gopalakrishnan2013-08-121-0/+2
| * | | Merge tag 'please-pull-mce-f-bit' of git://git.kernel.org/pub/scm/linux/kerne...Ingo Molnar2013-08-12386-2191/+3851
| |\ \ \
| | * | | x86/mce: Pay no attention to 'F' bit in MCACOD when parsing 'UC' errorsTony Luck2013-08-051-2/+11
| * | | | x86/mce, acpi/apei: Only disable banks listed in HEST if mce is configuredNaveen N. Rao2013-08-121-1/+2
| * | | | Merge branch 'x86/mce' into x86/rasIngo Molnar2013-08-1211-20/+150
| |\ \ \ \
| | * | | | mce: acpi/apei: Soft-offline a page on firmware GHES notificationNaveen N. Rao2013-07-103-10/+34
| | * | | | mce: acpi/apei: Add a boot option to disable ff mode for corrected errorsNaveen N. Rao2013-07-084-1/+14
| | * | | | mce: acpi/apei: Honour Firmware First for MCA banks listed in APEI HEST CMCNaveen N. Rao2013-07-085-10/+103
| * | | | | Merge tag 'ras_for_3.12' into x86/rasH. Peter Anvin2013-08-021-28/+23
| |\ \ \ \ \
| | * | | | | APEI/ERST: Fix error message formattingBorislav Petkov2013-07-311-28/+23
| |/ / / / /
* | | | | | Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/k...Linus Torvalds2013-09-041-10/+3
|\ \ \ \ \ \
| * | | | | | x86/acpi: Correct out-of-date comment of __acpi_map_table()Zhang Yanfei2013-07-261-10/+3
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'x86-paravirt-for-linus' of git://git.kernel.org/pub/scm/linux/k...Linus Torvalds2013-09-049-58/+50
|\ \ \ \ \ \
| * | | | | | x86: Correctly detect hypervisorJason Wang2013-08-056-28/+25
| * | | | | | x86, kvm: Switch to use hypervisor_cpuid_base()Jason Wang2013-08-051-15/+9
| * | | | | | xen: Switch to use hypervisor_cpuid_base()Jason Wang2013-08-051-15/+1
| * | | | | | x86: Introduce hypervisor_cpuid_base()Jason Wang2013-08-051-0/+15
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds2013-09-046-26/+31
|\ \ \ \ \ \
| * | | | | | x86: avoid remapping data in parse_setup_data()Linn Crosetto2013-08-143-13/+13
| * | | | | | x86: Use memblock_set_current_limit() to set limit for memblock.Tang Chen2013-08-141-2/+2
| * | | | | | mm: Remove unused variable idx0 in __early_ioremap()Jianguo Wu2013-08-131-3/+2
| * | | | | | mm/hotplug, x86: Disable ARCH_MEMORY_PROBE by defaultToshi Kani2013-07-222-8/+14
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'x86-kaslr-for-linus' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2013-09-048-40/+97
|\ \ \ \ \ \
| * | | | | | x86, relocs: Move ELF relocation handling to CKees Cook2013-08-088-40/+97
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'timers-nohz-for-linus' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds2013-09-0421-327/+545
|\ \ \ \ \ \
| * | | | | | nohz: Include local CPU in full dynticks global kickFrederic Weisbecker2013-08-161-0/+1
| * | | | | | Merge branch 'timers/nohz-v3' of git://git.kernel.org/pub/scm/linux/kernel/gi...Ingo Molnar2013-08-1422-328/+544
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | nohz: Optimize full dynticks's sched hooks with static keysFrederic Weisbecker2013-08-142-8/+20
| | * | | | | nohz: Optimize full dynticks state checks with static keysFrederic Weisbecker2013-08-142-14/+25
| | * | | | | nohz: Rename a few state variablesFrederic Weisbecker2013-08-141-22/+22
| | * | | | | vtime: Always debug check snapshot source _before_ updating itFrederic Weisbecker2013-08-141-2/+2
| | * | | | | vtime: Always scale generic vtime accounting resultsFrederic Weisbecker2013-08-141-6/+0
| | * | | | | vtime: Optimize full dynticks accounting off case with static keysFrederic Weisbecker2013-08-143-31/+67
| | * | | | | vtime: Describe overriden functions in dedicated arch headersFrederic Weisbecker2013-08-147-3/+14
| | * | | | | m68k: hardirq_count() only need preempt_mask.hFrederic Weisbecker2013-08-141-1/+1
| | * | | | | hardirq: Split preempt count mask definitionsFrederic Weisbecker2013-08-142-116/+123