diff options
| author | David S. Miller <davem@davemloft.net> | 2018-06-26 02:07:17 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-06-26 02:07:17 +0300 |
| commit | 9ff3b40e411c00870d1c29cd6b843fca7c4160ae (patch) | |
| tree | 4d58943bf8907f5704ba004fd5383c0d7683c61f /MAINTAINERS | |
| parent | 823819507095135b475a99048f0b0b6e75580fbc (diff) | |
| parent | 6f0d349d922ba44e4348a17a78ea51b7135965b1 (diff) | |
| download | linux-9ff3b40e411c00870d1c29cd6b843fca7c4160ae.tar.xz | |
Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 99e5cef8172e..f3e766e504d8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -9882,6 +9882,7 @@ M: Andrew Lunn <andrew@lunn.ch> M: Vivien Didelot <vivien.didelot@savoirfairelinux.com> M: Florian Fainelli <f.fainelli@gmail.com> S: Maintained +F: Documentation/devicetree/bindings/net/dsa/ F: net/dsa/ F: include/net/dsa.h F: include/linux/dsa/ @@ -15574,6 +15575,7 @@ M: x86@kernel.org L: linux-kernel@vger.kernel.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/core S: Maintained +F: Documentation/devicetree/bindings/x86/ F: Documentation/x86/ F: arch/x86/ |