aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <[email protected]>2018-04-02 15:56:32 +0100
committerMark Brown <[email protected]>2018-04-02 15:56:32 +0100
commitb3181e294959abb8ebd075a13515aefdbc7f68d1 (patch)
treee0fa99f85daff2eb51df753f885b0fe7eda14ff5
parent3ce2dcf70280980adf3f7a9dde4c1a96a20f2d0d (diff)
parent7c43042880836b1477e3b2ae404879ecd5bd2888 (diff)
Merge remote-tracking branch 'spi/topic/samsung' into spi-next
-rw-r--r--.mailmap1
-rw-r--r--MAINTAINERS2
2 files changed, 2 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index a2ce89a456c2..dc42cfb41304 100644
--- a/.mailmap
+++ b/.mailmap
@@ -18,6 +18,7 @@ Aleksey Gorelov <[email protected]>
Aleksandar Markovic <[email protected]> <[email protected]>
Andreas Herrmann <[email protected]>
Andrew Morton <[email protected]>
diff --git a/MAINTAINERS b/MAINTAINERS
index 6e950b8b4a41..4a7989b007ce 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -12222,7 +12222,7 @@ F: Documentation/devicetree/bindings/clock/exynos*.txt
SAMSUNG SPI DRIVERS
M: Kukjin Kim <[email protected]>
M: Krzysztof Kozlowski <[email protected]>
-M: Andi Shyti <[email protected]>
+M: Andi Shyti <[email protected]>
L: [email protected] (moderated for non-subscribers)
S: Maintained