aboutsummaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-10-03 13:28:46 -0400
committerIngo Molnar <mingo@elte.hu>2008-10-03 13:28:46 -0400
commitf68ec0c24755e5cdb779be6240925f2175311d84 (patch)
treea7b7128e61a8456385d82bd1c7ca5f14eecbf2ca /.mailmap
parent98920dc3d1113b883cbc73e3293446d3525c6042 (diff)
parent94aca1dac6f6d21f4b07e4864baf7768cabcc6e7 (diff)
Merge commit 'v2.6.27-rc8' into x86/setup
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap2
1 files changed, 2 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 726084286d33..dfab12f809ed 100644
--- a/.mailmap
+++ b/.mailmap
@@ -96,4 +96,6 @@ Tejun Heo <htejun@gmail.com>
96Thomas Graf <tgraf@suug.ch> 96Thomas Graf <tgraf@suug.ch>
97Tony Luck <tony.luck@intel.com> 97Tony Luck <tony.luck@intel.com>
98Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com> 98Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>
99Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
100Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
99Valdis Kletnieks <Valdis.Kletnieks@vt.edu> 101Valdis Kletnieks <Valdis.Kletnieks@vt.edu>