diff options
author | Olof Johansson <olof@lixom.net> | 2019-07-01 15:15:22 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2019-07-01 15:15:22 -0700 |
commit | adfbb80d38327b04a9cfb1635177dfca90de4a58 (patch) | |
tree | f827b0101cad3e2e1beff0dc59785c0f39f4d44d /fs/binfmt_em86.c | |
parent | 299a04586d75119d6a642fd0e0985f41c4d5d9f5 (diff) | |
parent | 519574e3259c8d7e5d78366ef513cfaaf650784f (diff) | |
download | linux-adfbb80d38327b04a9cfb1635177dfca90de4a58.tar.bz2 |
Merge tag 'v5.3-rockchip-dts32-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/dt
Display support for rk3228/rk3229 (up to hdmi output) and more love
for rk3288-veyron boards.
* tag 'v5.3-rockchip-dts32-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
ARM: dts: rockchip: add display nodes for rk322x
ARM: dts: rockchip: fix vop iommu-cells on rk322x
clk: rockchip: add clock id for hdmi_phy special clock on rk3228
clk: rockchip: add clock id for watchdog pclk on rk3328
Revert "ARM: dts: rockchip: set PWM delay backlight settings for Minnie"
ARM: dts: rockchip: Configure BT_DEV_WAKE in on rk3288-veyron
ARM: dts: rockchip: Configure BT_HOST_WAKE as wake-up signal on veyron
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'fs/binfmt_em86.c')
0 files changed, 0 insertions, 0 deletions