From: Olof Johansson Date: Mon, 19 Jun 2017 03:48:34 +0000 (-0700) Subject: Merge tag 'pxa-for-4.13' of https://github.com/rjarzmik/linux into next/soc X-Git-Tag: v4.13~427^2~11 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=da82480d453ef404b1ab0e0c449af2ab8282791b;p=mirror_ubuntu-bionic-kernel.git Merge tag 'pxa-for-4.13' of https://github.com/rjarzmik/linux into next/soc This is the pxa changes for v4.13 cycle. This cycle is a minor fixes one, with : - Coccinelle found improvements - magician getting touchscreen driver support. * tag 'pxa-for-4.13' of https://github.com/rjarzmik/linux: ARM: pxa: Delete an error message for a failed memory allocation in pxa3xx_u2d_probe() ARM: pxa: Improve a size determination in pxa3xx_u2d_probe() ARM: pxa: Delete an error message for a failed memory allocation in pxa_pm_init() ARM: pxa: magician: Add support for ADS7846 touchscreen Signed-off-by: Olof Johansson --- da82480d453ef404b1ab0e0c449af2ab8282791b