diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2021-02-24 14:59:24 -0600 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2021-02-24 14:59:24 -0600 |
commit | ce96d1d7b8eaf5d21e2537826e86a33882638fb5 (patch) | |
tree | 7f6058d2e477de6f1ba951d399b0e69d5d3545a0 /security/keys/big_key.c | |
parent | 4ab5718c3146114a54bbde3d5aafa19db66c2ea8 (diff) | |
parent | 8e61744de4d34162467b0b3e49aa9de8bf817180 (diff) | |
download | linux-stable-ce96d1d7b8eaf5d21e2537826e86a33882638fb5.tar.gz linux-stable-ce96d1d7b8eaf5d21e2537826e86a33882638fb5.tar.bz2 linux-stable-ce96d1d7b8eaf5d21e2537826e86a33882638fb5.zip |
Merge branch 'pci/rockchip'
- Make 'ep-gpios' DT property optional (Chen-Yu Tsai)
- Add FriendlyARM NanoPi M4B to rockchip DT binding (Chen-Yu Tsai)
* pci/rockchip:
dt-bindings: arm: rockchip: Add FriendlyARM NanoPi M4B
PCI: rockchip: Make 'ep-gpios' DT property optional
Diffstat (limited to 'security/keys/big_key.c')
0 files changed, 0 insertions, 0 deletions