summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2012-06-29 06:07:08 -0700
committerTony Lindgren <tony@atomide.com>2012-06-29 06:07:08 -0700
commitf6f1f12f6d4e9e4a44587e58ec96db25673083ec (patch)
tree68f44e3d64ebbee9f89c459136702ca243bbfa61 /.mailmap
parente0246e8ecad10b9437381b89756292ac031d4cfa (diff)
parenta77e1c4d09c88f98ac2e653382d2c1861dbb736f (diff)
Merge tag 'omap-devel-d-for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into fixes-non-critical
Some OMAP AM35xx fixes. The powerdomain and clockdomain data for the AM35xx are finally fixed. The AM35xx EMAC/MDIO Ethernet controller integration code has been converted to use the OMAP device and hwmod framework. Also the UART4 and HSOTGUSB warnings have been fixed.
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 2909c33bc54e..658003aa9446 100644
--- a/.mailmap
+++ b/.mailmap
@@ -111,6 +111,7 @@ Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
Uwe Kleine-König <ukl@pengutronix.de>
Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
+Viresh Kumar <viresh.linux@gmail.com> <viresh.kumar@st.com>
Takashi YOSHII <takashi.yoshii.zj@renesas.com>
Yusuke Goda <goda.yusuke@renesas.com>
Gustavo Padovan <gustavo@las.ic.unicamp.br>