Skip to content

Commit

Permalink
Merge remote-tracking branch 'spi/topic/samsung' into spi-next
Browse files Browse the repository at this point in the history
  • Loading branch information
broonie committed Apr 2, 2018
2 parents 3ce2dcf + 7c43042 commit b3181e2
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ Aleksey Gorelov <[email protected]>
Aleksandar Markovic <[email protected]> <[email protected]>
Al Viro <[email protected]>
Al Viro <[email protected]>
Andi Shyti <[email protected]> <[email protected]>
Andreas Herrmann <[email protected]>
Andrey Ryabinin <[email protected]> <[email protected]>
Andrew Morton <[email protected]>
Expand Down
2 changes: 1 addition & 1 deletion MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -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 <andi[email protected]>
M: Andi Shyti <andi@etezian.org>
L: [email protected]
L: [email protected] (moderated for non-subscribers)
S: Maintained
Expand Down

0 comments on commit b3181e2

Please sign in to comment.