diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2018-10-01 13:20:45 +0200 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2018-10-01 13:20:45 +0200 |
commit | 30aa69e7bd9f7af3574120249eecb3726dcaf737 (patch) | |
tree | b4a9ec1374ec9aed1022fdb32802c483952e5a97 /arch/mips/include/asm/mach-cavium-octeon/irq.h | |
parent | 63e037bc51b32d414cd07dd700e71359ce27a11f (diff) | |
parent | 17b57b1883c1285f3d0dc2266e8f79286a7bef38 (diff) | |
download | talos-obmc-linux-30aa69e7bd9f7af3574120249eecb3726dcaf737.tar.gz talos-obmc-linux-30aa69e7bd9f7af3574120249eecb3726dcaf737.zip |
Merge tag 'v4.19-rc6' into devel
This is the 4.19-rc6 release
I needed to merge this in because of extensive conflicts in
the MSM and Intel pin control drivers. I know how to resolve
them, so let's do it like this.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/mips/include/asm/mach-cavium-octeon/irq.h')
0 files changed, 0 insertions, 0 deletions