| commit | f2c56aac9573c1bcb54d5c06f4a0d0f23532aad1 | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Fri May 25 14:03:53 2018 -0700 |
| committer | Olof Johansson <olof@lixom.net> | Fri May 25 14:59:46 2018 -0700 |
| tree | b1ac7854a53b742a87dd4f3c3214517965c77075 | |
| parent | 771c577c23bac90597c685971d7297ea00f99d11 [diff] | |
| parent | d89ad4f0b44dde8c5333ef7a5d5824829cc72de3 [diff] |
Merge tag 'sunxi-fixes-for-4.17' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into fixes Allwinner fixes for 4.17 Here is a bunch of fixes for merge issues, typos and wrong clocks being described for simplefb, resulting in non-working displays. * tag 'sunxi-fixes-for-4.17' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: ARM: sun8i: v3s: fix spelling mistake: "disbaled" -> "disabled" ARM: dts: sun4i: Fix incorrect clocks for displays ARM: dts: sun8i: h3: Re-enable EMAC on Orange Pi One Signed-off-by: Olof Johansson <olof@lixom.net>