summaryrefslogtreecommitdiff
path: root/drivers/spi/spi-pxa2xx.h
diff options
context:
space:
mode:
authorAndrey Zhizhikin <andrey.z@gmail.com>2020-08-20 14:26:04 +0000
committerAndrey Zhizhikin <andrey.z@gmail.com>2020-08-20 14:26:04 +0000
commitb66890eae17a10b50a94472de6ed095ff8ebd315 (patch)
tree27a2be46771b907d0f6bc78825ad9d1e8b72477b /drivers/spi/spi-pxa2xx.h
parent397a487c917f91e3fbca6c9a1a5bffb779d42e76 (diff)
parentf61e1c3638dddaa1a1f3bb59d2bc288d9f0f1b5b (diff)
Merge tag 'v5.4.59' into 5.4-2.1.x-imx
This is the 5.4.59 stable release Conflicts (manual resolve): drivers/gpu/drm/imx/dw_hdmi-imx.c: drivers/gpu/drm/imx/imx-ldb.c: drivers/gpu/drm/imx/ipuv3/ipuv3-crtc.c: Port changes from upstream commit [1a279871012d3], which extends component lifetime by moving drm structures allocation/free from bind() to probe(). sound/soc/fsl/fsl_sai.c: Apply patch [b8ae2bf5ccc66] from upstream, which uses FIFO watermark mask macro. Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
Diffstat (limited to 'drivers/spi/spi-pxa2xx.h')
0 files changed, 0 insertions, 0 deletions