diff --git a/[refs] b/[refs] index a89c7b39fa86..0fb9eb4930bd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aae0f73604ff4bf65d0e4f5d4a10f214a6c98282 +refs/heads/master: fd34f85832550d419e8b70f284ad545cdde0664f diff --git a/trunk/.mailmap b/trunk/.mailmap index a62e6a84fd1e..581fd39193a2 100644 --- a/trunk/.mailmap +++ b/trunk/.mailmap @@ -105,3 +105,4 @@ Uwe Kleine-König Uwe Kleine-König Uwe Kleine-König Valdis Kletnieks +Takashi YOSHII