From b60e4bab7e47d0ecd83c9b97487c98d46365cee6 Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Tue, 25 Jan 2011 15:30:55 +0900
Subject: [PATCH] --- yaml --- r: 232368 b: refs/heads/master c:
 45f1798484748894c348a76fcf0b9ec43d891795 h: refs/heads/master v: v3

---
 [refs]         | 2 +-
 trunk/.mailmap | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2d5531054a8f..5cd74a5b936e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 63b1dd07fa378f2683ad03e543c36ec76f489364
+refs/heads/master: 45f1798484748894c348a76fcf0b9ec43d891795
diff --git a/trunk/.mailmap b/trunk/.mailmap
index 581fd39193a2..1eba28acab64 100644
--- a/trunk/.mailmap
+++ b/trunk/.mailmap
@@ -23,6 +23,7 @@ Andy Adamson <andros@citi.umich.edu>
 Arnaud Patard <arnaud.patard@rtp-net.org>
 Arnd Bergmann <arnd@arndb.de>
 Axel Dyks <xl@xlsigned.net>
+Axel Lin <axel.lin@gmail.com>
 Ben Gardner <bgardner@wabtec.com>
 Ben M Cahill <ben.m.cahill@intel.com>
 Björn Steinbrink <B.Steinbrink@gmx.de>