diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-05-10 14:48:48 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-05-10 14:48:48 +0300 |
| commit | 41caed560f800768f0f475ff2bec1e1b92674c0b (patch) | |
| tree | 36c0d0bd382004cf5281c21a56ae90bee7beca9f /arch/powerpc/include/asm/kvm_book3s_64.h | |
| parent | d6a58a5cc17a0f215bf80862b59ba82be5a2181f (diff) | |
| parent | f5515f9cdff136dc32517d4b81fe2b9091237b4a (diff) | |
| download | linux-41caed560f800768f0f475ff2bec1e1b92674c0b.tar.xz | |
Merge branch 'renesas/fixes-2' into next/dt64
This merges fixes from linux-4.6 into the next/dt64 tree to avoid
a later merge conflict.
* renesas/fixes-2:
arm64: dts: r8a7795: Don't disable referenced optional scif clock
ARM: shmobile: timer: Fix preset_lpj leading to too short delays
Revert "ARM: dts: porter: Enable SCIF_CLK frequency and pins"
ARM: dts: r8a7791: Don't disable referenced optional clocks
Diffstat (limited to 'arch/powerpc/include/asm/kvm_book3s_64.h')
0 files changed, 0 insertions, 0 deletions