summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'm68k-for-v4.7-tag1' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds2016-05-172-2/+2
|\
| * m68k/mvme16x: Include generic <linux/rtc.h>Geert Uytterhoeven2016-05-031-1/+1
| * m68k/bvme6000: Include generic <linux/rtc.h>Geert Uytterhoeven2016-05-031-1/+1
* | Merge tag 'metag-for-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/j...Linus Torvalds2016-05-173-2/+4
|\ \
| * | metag: Fix atomic_*_return inline asm constraintsJames Hogan2016-05-031-1/+1
| * | metag: perf: fix build on Meta1James Hogan2016-05-031-0/+3
| * | metag: ftrace: remove the misleading comment for ftrace_dyn_arch_initLi Bin2016-04-291-1/+0
* | | Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/k...Linus Torvalds2016-05-1712-793/+2895
|\ \ \
| * \ \ Merge branch 'x86/urgent' into x86/platform, to resolve conflictIngo Molnar2016-05-051-3/+1
| |\ \ \
| * | | | x86/platform/UV: Fix incorrect nodes and pnodes for cpuless and memoryless nodesDimitri Sivanich2016-05-041-30/+28
| * | | | x86/platform/UV: Remove Obsolete GRU MMR address translationDimitri Sivanich2016-05-042-26/+22
| * | | | x86/platform/UV: Update physical address conversions for UV4Mike Travis2016-05-042-18/+209
| * | | | x86/platform/UV: Build GAM reference tablesMike Travis2016-05-042-2/+155
| * | | | x86/platform/UV: Support UV4 socket address changesMike Travis2016-05-042-10/+129
| * | | | x86/platform/UV: Add obtaining GAM Range Table from UV BIOSMike Travis2016-05-043-28/+81
| * | | | x86/platform/UV: Add UV4 addressing discovery functionMike Travis2016-05-041-13/+72
| * | | | x86/platform/UV: Fold blade info into per node hub info structsMike Travis2016-05-042-150/+133
| * | | | x86/platform/UV: Allocate common per node hub info structs on local nodeMike Travis2016-05-042-19/+76
| * | | | x86/platform/UV: Move blade local processor ID to the per cpu info structMike Travis2016-05-044-7/+14
| * | | | x86/platform/UV: Move scir info to the per cpu info structMike Travis2016-05-042-16/+19
| * | | | x86/platform/UV: Create per cpu info structs to replace per hub info structsMike Travis2016-05-042-9/+25
| * | | | x86/platform/UV: Update MMIOH setup function to work for both UV3 and UV4Mike Travis2016-05-041-1/+2
| * | | | x86/platform/UV: Clean up redunduncies after merge of UV4 MMR definitionsMike Travis2016-05-042-10/+0
| * | | | x86/platform/UV: Add UV4 Specific MMR definitionsMike Travis2016-05-041-422/+1769
| * | | | x86/platform/UV: Prep for UV4 MMR updatesMike Travis2016-05-042-84/+129
| * | | | x86/platform/UV: Add UV MMR Illegal Access FunctionMike Travis2016-05-041-0/+12
| * | | | x86/platform/UV: Add UV4 Specific DefinesMike Travis2016-05-041-3/+9
| * | | | x86/platform/UV: Add UV Architecture DefinesMike Travis2016-05-041-5/+31
| * | | | x86/platform/UV: Add Initial UV4 definitionsMike Travis2016-05-042-24/+62
| * | | | Merge tag 'v4.6-rc6' into x86/platform, to refresh the treeIngo Molnar2016-05-041366-9148/+15023
| |\ \ \ \
| * | | | | x86/platform: Remove unused get_bios_ebda_length() functionGuenter Roeck2016-04-131-21/+0
| * | | | | x86/platform/uv: Disable UV BAU by defaultAlex Thorlton2016-04-013-11/+34
* | | | | | Merge branch 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2016-05-171-13/+6
|\ \ \ \ \ \
| * | | | | | x86/dumpstack: Combine some printk()sRasmus Villemoes2016-03-311-13/+6
* | | | | | | Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/k...Linus Torvalds2016-05-173-4/+4
|\ \ \ \ \ \ \
| * | | | | | | x86: Fix non-static inlinesDenys Vlasenko2016-04-163-4/+4
* | | | | | | | Merge branch 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2016-05-171-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | x86/build/defconfig/64: Enable CONFIG_E1000E=yKonstantin Khlebnikov2016-04-191-0/+1
* | | | | | | | | Merge branch 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2016-05-1750-786/+1262
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | x86/KASLR: Clarify purpose of each get_random_long()Kees Cook2016-05-101-4/+5
| * | | | | | | | | x86/KASLR: Add virtual address choosing functionBaoquan He2016-05-101-4/+28
| * | | | | | | | | x86/KASLR: Return earliest overlap when avoiding regionsKees Cook2016-05-101-9/+20
| * | | | | | | | | x86/KASLR: Add 'struct slot_area' to manage random_addr slotsBaoquan He2016-05-101-0/+29
| * | | | | | | | | x86/boot: Add missing file header commentsKees Cook2016-05-103-1/+10
| * | | | | | | | | x86/KASLR: Initialize mapping_info every timeKees Cook2016-05-101-11/+5
| * | | | | | | | | x86/boot: Comment what finalize_identity_maps() doesBorislav Petkov2016-05-101-0/+2
| * | | | | | | | | x86/KASLR: Build identity mappings on demandKees Cook2016-05-076-2/+187
| * | | | | | | | | x86/boot: Split out kernel_ident_mapping_init()Yinghai Lu2016-05-073-73/+80
| * | | | | | | | | x86/boot: Clean up indenting for asm/boot.hKees Cook2016-05-071-11/+9
| * | | | | | | | | x86/KASLR: Improve comments around the mem_avoid[] logicKees Cook2016-05-071-48/+78