aboutsummaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2008-10-31 12:13:10 -0400
committerTakashi Iwai <tiwai@suse.de>2008-10-31 12:13:10 -0400
commit7b3b6e42032e94a6132a85642e95106f5346650e (patch)
tree8b2262291341d8a9f9b1e7e3c63a3289bb6c6de6 /.mailmap
parent04172c0b9ea5861e5cba7909da5297b3aedac9e1 (diff)
parent0173a3265b228da319ceb9c1ec6a5682fd1b2d92 (diff)
Merge commit 'v2.6.28-rc2' into topic/asoc
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index dfab12f809ed..eba9bf953ef5 100644
--- a/.mailmap
+++ b/.mailmap
@@ -66,6 +66,7 @@ Kenneth W Chen <kenneth.w.chen@intel.com>
66Koushik <raghavendra.koushik@neterion.com> 66Koushik <raghavendra.koushik@neterion.com>
67Leonid I Ananiev <leonid.i.ananiev@intel.com> 67Leonid I Ananiev <leonid.i.ananiev@intel.com>
68Linas Vepstas <linas@austin.ibm.com> 68Linas Vepstas <linas@austin.ibm.com>
69Mark Brown <broonie@sirena.org.uk>
69Matthieu CASTET <castet.matthieu@free.fr> 70Matthieu CASTET <castet.matthieu@free.fr>
70Michael Buesch <mb@bu3sch.de> 71Michael Buesch <mb@bu3sch.de>
71Michael Buesch <mbuesch@freenet.de> 72Michael Buesch <mbuesch@freenet.de>