summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds2017-06-2010-8/+19
|\
| * Merge tag 'sunxi-clk-fixes-for-4.12' of https://git.kernel.org/pub/scm/linux/...Stephen Boyd2017-06-148-7/+17
| |\
| | * clk: sunxi-ng: a64: Export PLL_PERIPH0 clock for the PRCMChen-Yu Tsai2017-05-312-1/+5
| | * clk: sunxi-ng: h3: Export PLL_PERIPH0 clock for the PRCMChen-Yu Tsai2017-05-312-1/+5
| | * dt-bindings: clock: sunxi-ccu: Add pll-periph to PRCM's needed clocksChen-Yu Tsai2017-05-311-3/+4
| | * clk: sunxi-ng: enable SUNXI_CCU_MP for PRCMArnd Bergmann2017-05-181-0/+1
| | * clk: sunxi-ng: v3s: Fix usb otg device reset bitYong Deng2017-05-141-1/+1
| | * clk: sunxi-ng: a31: Correct lcd1-ch1 clock register offsetChen-Yu Tsai2017-05-141-1/+1
| * | Merge tag 'meson-clk-fixes-for-4.12-rc2' of git://github.com/baylibre/clk-mes...Michael Turquette2017-05-251-0/+1
| |\ \
| | * | clk: meson: gxbb: fix build error without RESET_CONTROLLERTobias Regnery2017-05-161-0/+1
| | |/
| * / clk: sunxi-ng: sun5i: Fix ahb_bist_clk definitionBoris Brezillon2017-05-251-1/+1
| |/
* | Merge tag 'ntb-4.12-bugfixes' of git://github.com/jonmason/ntbLinus Torvalds2017-06-204-51/+15
|\ \
| * | ntb: no sleep in ntb_async_tx_submitAllen Hubbe2017-06-191-43/+7
| * | ntb: ntb_hw_intel: Skylake doorbells should be 32bits, not 64bitsDave Jiang2017-06-191-1/+1
| * | ntb_transport: fix bug calculating num_qps_mwLogan Gunthorpe2017-06-191-2/+2
| * | ntb_transport: fix qp count bugLogan Gunthorpe2017-06-191-2/+2
| * | NTB: ntb_test: fix bug printing ntb_perf resultsLogan Gunthorpe2017-06-191-1/+1
| * | ntb: Correct modinfo usage statement for ntb_perfGary R Hook2017-06-191-2/+2
|/ /
* | Linux 4.12-rc6v4.12-rc6Linus Torvalds2017-06-191-1/+1
* | mm: larger stack guard gap, between vmasHugh Dickins2017-06-1923-163/+152
* | Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...Linus Torvalds2017-06-195-13/+10
|\ \
| * \ Merge tag 'sunxi-fixes-for-4.12' of https://git.kernel.org/pub/scm/linux/kern...Olof Johansson2017-06-184-7/+8
| |\ \
| | * | arm64: allwinner: a64: Add PLL_PERIPH0 clock to the R_CCUChen-Yu Tsai2017-06-031-2/+3
| | * | ARM: sunxi: h3-h5: Add PLL_PERIPH0 clock to the R_CCUChen-Yu Tsai2017-06-031-2/+3
| | * | arm64: allwinner: h5: Remove syslink to shared DTSIMaxime Ripard2017-05-202-2/+1
| | * | ARM: sunxi: h3/h5: fix the compatible of R_CCUIcenowy Zheng2017-05-141-1/+1
| | |/
| * | Merge tag 'omap-for-v4.12/fixes-sl50' of git://git.kernel.org/pub/scm/linux/k...Olof Johansson2017-06-181-6/+2
| |\ \
| | * | ARM: dts: am335x-sl50: Fix cannot claim requested pins for spi0Enric Balletbo i Serra2017-05-261-4/+0
| | * | ARM: dts: am335x-sl50: Fix card detect pin for mmc1Enric Balletbo i Serra2017-05-261-2/+2
* | | | Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhostLinus Torvalds2017-06-191-0/+7
|\ \ \ \
| * | | | virtio_balloon: disable VIOMMU supportMichael S. Tsirkin2017-06-181-0/+7
* | | | | Merge branch 'i2c/for-current-fixed' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds2017-06-192-2/+2
|\ \ \ \ \
| * | | | | i2c: ismt: fix wrong device address when unmap the data bufferLiwei Song2017-06-151-1/+1
| * | | | | i2c: rcar: use correct length when unmapping DMAWolfram Sang2017-06-151-1/+1
| |/ / / /
* | | | | Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linusLinus Torvalds2017-06-198-31/+34
|\ \ \ \ \
| * | | | | MIPS: .its targets depend on vmlinuxPaul Burton2017-06-151-5/+5
| * | | | | MIPS: Fix bnezc/jialc return address calculationPaul Burton2017-06-151-1/+3
| * | | | | MIPS: kprobes: flush_insn_slot should flush only if probe initialisedMarcin Nowakowski2017-06-081-1/+2
| * | | | | MIPS: ftrace: fix init functions tracingMarcin Nowakowski2017-06-081-19/+5
| * | | | | MIPS: mm: adjust PKMAP locationMarcin Nowakowski2017-06-081-1/+6
| * | | | | MIPS: highmem: ensure that we don't use more than one page for PTEsMarcin Nowakowski2017-06-081-0/+5
| * | | | | MIPS: mm: fixed mappings: correct initialisationMarcin Nowakowski2017-06-081-3/+3
| * | | | | MIPS: perf: Remove incorrect odd/even counter handling for I6400Marcin Nowakowski2017-06-081-1/+5
* | | | | | Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2017-06-184-4/+8
|\ \ \ \ \ \
| * | | | | | x86/mm: Disable 1GB direct mappings when disabling 2MB mappingsVlastimil Babka2017-06-131-3/+3
| * | | | | | x86/debug: Handle early WARN_ONs properPeter Zijlstra2017-06-123-1/+5
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/...Linus Torvalds2017-06-183-6/+14
|\ \ \ \ \ \
| * | | | | | tick/broadcast: Make tick_broadcast_setup_oneshot() staticStephen Boyd2017-06-122-3/+3
| * | | | | | alarmtimer: Rate limit periodic intervalsThomas Gleixner2017-06-041-0/+8
| * | | | | | alarmtimer: Prevent overflow of relative timersThomas Gleixner2017-06-041-3/+3