diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-06-09 11:01:49 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-06-09 11:01:49 +1000 |
| commit | fa625c1956830c826ebf13324c2b33fcabef7db0 (patch) | |
| tree | 92c7f1272617c5c6a82478ba161af97eae0260cd /MAINTAINERS | |
| parent | 66fd7a66e8b9e11e49f46ea77910f935c4dee5c3 (diff) | |
| parent | af8c34ce6ae32addda3788d54a7e340cad22516b (diff) | |
| download | linux-stable-fa625c1956830c826ebf13324c2b33fcabef7db0.tar.gz linux-stable-fa625c1956830c826ebf13324c2b33fcabef7db0.tar.bz2 linux-stable-fa625c1956830c826ebf13324c2b33fcabef7db0.zip | |
Backmerge tag 'v4.7-rc2' into drm-next
Daniel has a pull request that relies on stuff in fixes that are in rc2.
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 150d52cb983c..81382b2858db 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7992,6 +7992,7 @@ Q: http://patchwork.ozlabs.org/project/netdev/list/ T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git S: Odd Fixes +F: Documentation/devicetree/bindings/net/ F: drivers/net/ F: include/linux/if_* F: include/linux/netdevice.h @@ -8947,6 +8948,7 @@ M: Linus Walleij <linus.walleij@linaro.org> L: linux-gpio@vger.kernel.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git S: Maintained +F: Documentation/devicetree/bindings/pinctrl/ F: drivers/pinctrl/ F: include/linux/pinctrl/ |