diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-04-28 16:11:54 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-04-28 16:11:54 +0200 |
| commit | bf6fc0a2494df5a5750ff7afe071eaf8f127c242 (patch) | |
| tree | d8b2ba225212d84c0b6e1578dca1118b587b2478 /security/selinux/hooks.c | |
| parent | fb89cf36b6041ac87ad75ad0f5f23b2643fc6f97 (diff) | |
| parent | 9f33a8a9e1b7dbb0b91a58af958d1c301a6fab1a (diff) | |
Merge tag 'renesas-arm64-dt2-for-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt64
Merge "Second Round of Renesas ARM64 Based SoC DT Updates for v4.7" from Simon Horman:
* Don't disable referenced optional clocks in DT of r8a7795 SoC
* Populate EXTALR in DT of salvator-x board
* Enable PCIe in DT of salvator-x board
* tag 'renesas-arm64-dt2-for-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
arm64: dts: r8a7795: Don't disable referenced optional clocks
arm64: dts: salvator-x: populate EXTALR
arm64: dts: r8a7795: enable PCIe on Salvator-X
arm64: dts: r8a7795: Add PCIe nodes
arm64: dts: r8a7795: Use USB3.0 fallback compatibility string
arm64: dts: r8a7795: Add CAN support
arm64: dts: r8a7795: Add CAN external clock support
Diffstat (limited to 'security/selinux/hooks.c')
0 files changed, 0 insertions, 0 deletions