tree d33cc24f37a88b5d2217675276ffc06032f66bbd
parent 8f28ed92d9314b98dc2033df770f5e6b85c5ffb7
author Viresh Kumar <viresh.kumar@linaro.org> 1397858836 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1397864408 -0700

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>