summaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2015-03-16 17:22:41 +0300
committerArnd Bergmann <arnd@arndb.de>2015-03-16 17:22:41 +0300
commit3034b0082e22755909bdb5be2a1536fa2cf10f56 (patch)
treedb2afd51dd73c95cfcd5c5cd50610bf6fe2502dc /MAINTAINERS
parent06e5801b8cb3fc057d88cb4dc03c0b64b2744cda (diff)
parent54b0bc602541fcc2dd9f2480623c00552e0b220e (diff)
downloadlinux-3034b0082e22755909bdb5be2a1536fa2cf10f56.tar.xz
Merge tag 'v4.0-rockchip-armfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into fixes
Pull "ARM: rockchip: small fixes for 4.0-rc" from Heiko Stuebner: Adding a default-disabled state to the new gmac node and an update to the MAINTAINERS entry adding a rockchip regexp entry. * tag 'v4.0-rockchip-armfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: ARM: dts: rockchip: disable gmac by default in rk3288.dtsi MAINTAINERS: add rockchip regexp to the ARM/Rockchip entry
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS1
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 0e1abe8cc684..57220714a33c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1362,6 +1362,7 @@ F: drivers/i2c/busses/i2c-rk3x.c
F: drivers/*/*rockchip*
F: drivers/*/*/*rockchip*
F: sound/soc/rockchip/
+N: rockchip
ARM/SAMSUNG EXYNOS ARM ARCHITECTURES
M: Kukjin Kim <kgene@kernel.org>