diff options
| author | David S. Miller <davem@davemloft.net> | 2015-08-21 11:44:04 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-08-21 11:44:04 -0700 |
| commit | dc25b25897289bad4907f30151ffe5baf75ff369 (patch) | |
| tree | c99301de2cdf66d7af48fc43b6161bda6faaae70 /MAINTAINERS | |
| parent | 1a69205c471221a7f9101df164642611e37c52e4 (diff) | |
| parent | 0bad90985d39e69ca035fdd70bcc743812641d18 (diff) | |
| download | linux-dc25b25897289bad4907f30151ffe5baf75ff369.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/usb/qmi_wwan.c
Overlapping additions of new device IDs to qmi_wwan.c
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 7b528b8c73f8..7b1b552630b8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3588,6 +3588,15 @@ S: Maintained F: drivers/gpu/drm/rockchip/ F: Documentation/devicetree/bindings/video/rockchip* +DRM DRIVERS FOR STI +M: Benjamin Gaignard <benjamin.gaignard@linaro.org> +M: Vincent Abriou <vincent.abriou@st.com> +L: dri-devel@lists.freedesktop.org +T: git http://git.linaro.org/people/benjamin.gaignard/kernel.git +S: Maintained +F: drivers/gpu/drm/sti +F: Documentation/devicetree/bindings/gpu/st,stih4xx.txt + DSBR100 USB FM RADIO DRIVER M: Alexey Klimov <klimov.linux@gmail.com> L: linux-media@vger.kernel.org |