diff options
| author |   Dave Airlie <airlied@redhat.com> | 2017-04-19 11:07:14 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-04-19 11:07:14 +1000 |
| commit | 856ee92e8602bd86d34388ac08381c5cb3918756 (patch) | |
| tree | c3bed2bf85214f78239724adb34a1c2d6ec8444d /MAINTAINERS | |
| parent | Merge tag 'drm-misc-next-fixes-2017-04-12' of git://anongit.freedesktop.org/git/drm-misc into drm-next (diff) | |
| parent | Linux 4.11-rc7 (diff) | |
| download | wireguard-linux-856ee92e8602bd86d34388ac08381c5cb3918756.tar.xz wireguard-linux-856ee92e8602bd86d34388ac08381c5cb3918756.zip | |
Merge tag 'v4.11-rc7' into drm-next
Backmerge Linux 4.11-rc7 from Linus tree, to fix some
conflicts that were causing problems with the rerere cache
in drm-tip.
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 7df09152b2e0..93ed0319b3d6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -13331,7 +13331,7 @@ F: drivers/virtio/ F: tools/virtio/ F: drivers/net/virtio_net.c F: drivers/block/virtio_blk.c -F: include/linux/virtio_*.h +F: include/linux/virtio*.h F: include/uapi/linux/virtio_*.h F: drivers/crypto/virtio/ |