Merge branch 'master' of git://git.denx.de/u-boot-sunxi

[u-boot] / .mailmap

diff --git a/.mailmap b/.mailmap
index 14b5ad7e5c40f9260abb68e6608ed87893f24e52..bd7267241a8effa4479227739d15d55f69c413c2 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -20,6 +20,7 @@ Jagan Teki <jaganna@xilinx.com>
 Jagan Teki <jagannadh.teki@gmail.com>
 Jagan Teki <jagannadha.sutradharudu-teki@xilinx.com>
 Markus Klotzbuecher <mk@denx.de>
+Paul Burton <paul.burton@mips.com> <paul.burton@imgtec.com>
 Prabhakar Kushwaha <prabhakar@freescale.com>
 Rajeshwari Shinde <rajeshwari.s@samsung.com>
 Ricardo Ribalda <ricardo.ribalda@uam.es>