aboutsummaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-01-15 12:27:20 -0500
committerTakashi Iwai <tiwai@suse.de>2009-01-15 12:27:20 -0500
commitc0106d72b8d71696dbe9dc80e2c77d4ac63f7531 (patch)
treeca96d2baecb0555e36219ed6968dc8e306e530ca /.mailmap
parent5852973c129cf7c7e6c229abb7250673fc2a50c9 (diff)
parenteff317d0834ad1ff03f747f6bc2d76b9a9c95160 (diff)
Merge branch 'topic/asoc' into next/asoc
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 97f7b4fb6139..4e83e7b52d15 100644
--- a/.mailmap
+++ b/.mailmap
@@ -32,6 +32,7 @@ Christoph Hellwig <hch@lst.de>
32Corey Minyard <minyard@acm.org> 32Corey Minyard <minyard@acm.org>
33David Brownell <david-b@pacbell.net> 33David Brownell <david-b@pacbell.net>
34David Woodhouse <dwmw2@shinybook.infradead.org> 34David Woodhouse <dwmw2@shinybook.infradead.org>
35Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
35Domen Puncer <domen@coderock.org> 36Domen Puncer <domen@coderock.org>
36Douglas Gilbert <dougg@torque.net> 37Douglas Gilbert <dougg@torque.net>
37Ed L. Cashin <ecashin@coraid.com> 38Ed L. Cashin <ecashin@coraid.com>