summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/l...Linus Torvalds2018-06-1210-157/+50
|\
| * Merge branches 'thermal-core' and 'thermal-intel' into nextZhang Rui2018-05-302-3/+7
| |\
| | * thermal: int340x: processor_thermal: Add GeminiLake supportSumeet Pawnikar2018-05-301-0/+4
| | * thermal: int340x: Prevent error in reading trip hysteresis attributeSrinivas Pandruvada2018-05-301-3/+3
| * | drivers: thermal: Update license to SPDX formatLina Iyer2018-05-308-94/+8
| * | thermal: Use DEVICE_ATTR_{RO|RW|WO}() variantsViresh Kumar2018-05-221-7/+7
| * | thermal: Shorten name of sysfs callbacksViresh Kumar2018-05-223-59/+34
| |/
* | Merge tag 'ntb-4.18' of git://github.com/jonmason/ntbLinus Torvalds2018-06-128-813/+1001
|\ \
| * | ntb: ntb_transport: Replace GFP_ATOMIC with GFP_KERNEL in ntb_transport_creat...Jia-Ju Bai2018-06-111-2/+2
| * | ntb: ntb_transport: Replace GFP_ATOMIC with GFP_KERNEL in ntb_transport_setup...Jia-Ju Bai2018-06-111-1/+1
| * | NTB: ntb_hw_idt: fix typo 'can by' to 'can be'Wolfram Sang2018-06-111-1/+1
| * | ntb: intel: change references of skx to gen3Dave Jiang2018-06-114-130/+126
| * | ntb: intel: split out the gen3 codeDave Jiang2018-06-116-657/+754
| * | ntb: intel: header definitions refactorDave Jiang2018-06-114-142/+237
* | | Merge tag 'vfio-v4.18-rc1' of git://github.com/awilliam/linux-vfioLinus Torvalds2018-06-1213-116/+2622
|\ \ \
| * | | samples: mbochs: add DMA_SHARED_BUFFER dependencyArnd Bergmann2018-06-091-0/+1
| * | | vfio: platform: Fix using devices in PM DomainsGeert Uytterhoeven2018-06-081-0/+10
| * | | vfio: use match_string() helperYisheng Xie2018-06-081-8/+3
| * | | vfio/mdev: Re-order sysfs attribute creationAlex Williamson2018-06-081-7/+7
| * | | vfio/mdev: Check globally for duplicate devicesAlex Williamson2018-06-083-67/+42
| * | | vfio: platform: Make printed error messages more consistentGeert Uytterhoeven2018-06-081-3/+2
| * | | vfio: platform: Fix reset module leak in error pathGeert Uytterhoeven2018-06-081-5/+10
| * | | sample: vfio bochs vbe display (host device for bochs-drm)Gerd Hoffmann2018-06-083-0/+1420
| * | | sample: vfio mdev display - guest driverGerd Hoffmann2018-06-083-0/+242
| * | | sample: vfio mdev display - host deviceGerd Hoffmann2018-06-084-0/+838
| * | | vfio/type1: Fix task tracking for QEMU vCPU hotplugAlex Williamson2018-06-081-26/+47
| |/ /
* | | Merge tag 'mips_4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/l...Linus Torvalds2018-06-1260-392/+339
|\ \ \
| * | | MAINTAINERS: Add Paul Burton as MIPS co-maintainerJames Hogan2018-06-111-0/+2
| * | | MIPS: ptrace: Make FPU context layout comments match realityMaciej W. Rozycki2018-05-242-4/+4
| * | | MIPS: memset.S: Reinstate delay slot indentationMatt Redfearn2018-05-211-14/+14
| * | | MIPS: perf: Fix perf with MT counting other threadsMatt Redfearn2018-05-151-39/+39
| * | | MIPS: perf: Use correct VPE ID when setting up VPE tracingMatt Redfearn2018-05-151-10/+2
| * | | MIPS: perf: More robustly probe for the presence of per-tc countersMatt Redfearn2018-05-153-5/+7
| * | | MIPS: Probe for MIPS MT perf counters per TCMatt Redfearn2018-05-153-0/+19
| * | | MIPS: mscc: Connect phys to ports on ocelot_pcb123Alexandre Belloni2018-05-151-0/+20
| * | | MIPS: mscc: Add switch to ocelotAlexandre Belloni2018-05-151-0/+88
| * | | MIPS: JZ4740: Drop old platform reset codePaul Cercueil2018-05-151-31/+0
| * | | MIPS: qi_lb60: Enable the jz4740-wdt driverPaul Cercueil2018-05-151-0/+2
| * | | MIPS: JZ4780: dts: Fix watchdog nodePaul Cercueil2018-05-152-2/+10
| * | | MIPS: JZ4740: dts: Add bindings for the jz4740-wdt driverPaul Cercueil2018-05-153-17/+8
| * | | watchdog: JZ4740: Drop module remove functionPaul Cercueil2018-05-151-8/+0
| * | | watchdog: JZ4740: Register a restart handlerPaul Cercueil2018-05-151-0/+9
| * | | watchdog: JZ4740: Use devm_* functionsPaul Cercueil2018-05-151-19/+8
| * | | watchdog: JZ4740: Disable clock after stopping counterPaul Cercueil2018-05-151-1/+1
| * | | MIPS: VPE: Fix spelling mistake: "uneeded" -> "unneeded"Colin Ian King2018-05-151-1/+1
| * | | MIPS: Re-use kstrtobool_from_user()Andy Shevchenko2018-05-151-8/+1
| * | | MIPS: Convert update_persistent_clock() to update_persistent_clock64()Baolin Wang2018-05-158-39/+30
| * | | MIPS: Convert read_persistent_clock() to read_persistent_clock64()Baolin Wang2018-05-158-16/+16
| * | | MIPS: sni: Remove the read_persistent_clock()Baolin Wang2018-05-151-6/+0
| * | | MIPS: BCM47XX: Use __initdata for the bcm47xx_leds_pdataRafał Miłecki2018-04-231-1/+1