diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-19 16:50:09 +0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-19 16:50:09 +0800 |
| commit | 1132d5e7b64445b3fa3cb982e6723e33318f7655 (patch) | |
| tree | e80fea00909b982bd7a745184a5a7c3f58a3f8dc /mm/memory.c | |
| parent | 3696e4f0b0072eb9753ffa1387be1dd2ebe2cb8f (diff) | |
| parent | a1858df975edf6706e7a5a3ae000e52d81076807 (diff) | |
| download | linux-stable-1132d5e7b64445b3fa3cb982e6723e33318f7655.tar.gz linux-stable-1132d5e7b64445b3fa3cb982e6723e33318f7655.tar.bz2 linux-stable-1132d5e7b64445b3fa3cb982e6723e33318f7655.zip | |
Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC fixes from Olof Johansson:
"Stream of fixes has slowed down, only a few this week:
- Some DT fixes for Allwinner platforms, and addition of a clock to
the R_CCU clock controller that had been missed.
- A couple of small DT fixes for am335x-sl50"
* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
arm64: allwinner: a64: Add PLL_PERIPH0 clock to the R_CCU
ARM: sunxi: h3-h5: Add PLL_PERIPH0 clock to the R_CCU
ARM: dts: am335x-sl50: Fix cannot claim requested pins for spi0
ARM: dts: am335x-sl50: Fix card detect pin for mmc1
arm64: allwinner: h5: Remove syslink to shared DTSI
ARM: sunxi: h3/h5: fix the compatible of R_CCU
Diffstat (limited to 'mm/memory.c')
0 files changed, 0 insertions, 0 deletions