diff options
| author | Viresh Kumar | 2014-04-18 17:07:16 -0500 |
|---|---|---|
| committer | Linus Torvalds | 2014-04-18 18:40:08 -0500 |
| commit | 9cc236827fde5e254fd995a0023c05c5ee3a3ba6 (patch) | |
| tree | d33cc24f37a88b5d2217675276ffc06032f66bbd /MAINTAINERS | |
| parent | 8f28ed92d9314b98dc2033df770f5e6b85c5ffb7 (diff) | |
| download | linux-phy-9cc236827fde5e254fd995a0023c05c5ee3a3ba6.tar.gz linux-phy-9cc236827fde5e254fd995a0023c05c5ee3a3ba6.tar.xz linux-phy-9cc236827fde5e254fd995a0023c05c5ee3a3ba6.zip | |
Shiraz has moved
shiraz.hashim@st.com email-id doesn't exist anymore as he has left the
company. Replace ST's id with shiraz.linux.kernel@gmail.com.
It also updates .mailmap file to fix address for 'git shortlog'.
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Cc: Shiraz Hashim <shiraz.linux.kernel@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 80399fff805d..e67ea2442041 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -8315,7 +8315,7 @@ F: include/linux/compiler.h | |||
| 8315 | 8315 | ||
| 8316 | SPEAR PLATFORM SUPPORT | 8316 | SPEAR PLATFORM SUPPORT |
| 8317 | M: Viresh Kumar <viresh.linux@gmail.com> | 8317 | M: Viresh Kumar <viresh.linux@gmail.com> |
| 8318 | M: Shiraz Hashim <shiraz.hashim@st.com> | 8318 | M: Shiraz Hashim <shiraz.linux.kernel@gmail.com> |
| 8319 | L: spear-devel@list.st.com | 8319 | L: spear-devel@list.st.com |
| 8320 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | 8320 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) |
| 8321 | W: http://www.st.com/spear | 8321 | W: http://www.st.com/spear |