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
diff --git a/.mailmap b/.mailmap
index 7260842..dfab12f 100644
--- a/.mailmap
+++ b/.mailmap
@@ -96,4 +96,6 @@
 Thomas Graf <[email protected]>
 Tony Luck <[email protected]>
 Tsuneo Yoshioka <[email protected]>
+Uwe Kleine-König <[email protected]>
+Uwe Kleine-König <[email protected]>
 Valdis Kletnieks <[email protected]>