diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-09 16:33:05 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-09 16:33:05 -0400 |
| commit | c97f68145e8067b3ac4b126a6faebf90f9ffc302 (patch) | |
| tree | eb2060681552a00e9efa98224b95f69a3dc84390 /.mailmap | |
| parent | b1add0480a95b6ceaece5caf6c50614771eae9b2 (diff) | |
| parent | 7bff3c4ce44ea48f50dc47a5994454984bd08c59 (diff) | |
Merge branch 'for-rmk' of git://source.mvista.com/git/linux-davinci-2.6.git
Merge branch 'davinci' into devel
Diffstat (limited to '.mailmap')
| -rw-r--r-- | .mailmap | 2 |
1 files changed, 2 insertions, 0 deletions
| @@ -96,4 +96,6 @@ Tejun Heo <htejun@gmail.com> | |||
| 96 | Thomas Graf <tgraf@suug.ch> | 96 | Thomas Graf <tgraf@suug.ch> |
| 97 | Tony Luck <tony.luck@intel.com> | 97 | Tony Luck <tony.luck@intel.com> |
| 98 | Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com> | 98 | Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com> |
| 99 | Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com> | ||
| 100 | Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de> | ||
| 99 | Valdis Kletnieks <Valdis.Kletnieks@vt.edu> | 101 | Valdis Kletnieks <Valdis.Kletnieks@vt.edu> |