commit bc45eb8950b8c14487385cfd2bda1613ca8d9703
author Linus Torvalds <torvalds@linux-foundation.org> Sun Sep 14 22:50:43 2008 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Sun Sep 14 22:50:43 2008 -0700
tree 246f0d72d55a48ae3be330a99135e29d000849ef
parent 212387055902b65f79463d1934033255aa6b99e1
parent ba95487df97f9c45cfdae2a47de56235e7a13dc5

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: talitos - Avoid consecutive packets going out with same IV

.mailmap

diff --git a/.mailmap b/.mailmap
index 7260842..dfab12f 100644
--- a/.mailmap
+++ b/.mailmap
@@ -96,4 +96,6 @@
 Thomas Graf <tgraf@suug.ch>
 Tony Luck <tony.luck@intel.com>
 Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>
+Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
+Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
 Valdis Kletnieks <Valdis.Kletnieks@vt.edu>