diff options
author | Greg Kroah-Hartman | 2018-09-16 22:04:13 +0200 |
---|---|---|
committer | Greg Kroah-Hartman | 2018-09-16 22:04:13 +0200 |
commit | 7dc074348eb85d48f7a1fa96879458f4becf68a7 (patch) | |
tree | af626c941574ea68f7d74da04d81e302fbc14a68 /drivers/gpu/drm/nouveau/nvkm/subdev/mmu/memnv04.c | |
parent | MAINTAINERS: remove myself as staging FBTFT maintainer (diff) | |
parent | Linux 4.19-rc4 (diff) | |
download | kernel-qcow2-linux-7dc074348eb85d48f7a1fa96879458f4becf68a7.tar.gz kernel-qcow2-linux-7dc074348eb85d48f7a1fa96879458f4becf68a7.tar.xz kernel-qcow2-linux-7dc074348eb85d48f7a1fa96879458f4becf68a7.zip |
Merge 4.19-rc4 into staging-next
Handle the merge issues and take the iio and staging driver fixes.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/subdev/mmu/memnv04.c')
0 files changed, 0 insertions, 0 deletions