summaryrefslogtreecommitdiff
path: root/drivers/pinctrl/spear/pinctrl-spear.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-07-20 23:21:28 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-07-20 23:21:28 +0300
commited15e8880fc3d8d52bc02a02521054bfcb26264a (patch)
tree816a7f35028762976f5d4bc4df172e407c4bcbe2 /drivers/pinctrl/spear/pinctrl-spear.c
parentb8d1f261fe7e4967593a5637d62991b6197a03f8 (diff)
parent52721d9d3334c1cb1f76219a161084094ec634dc (diff)
downloadlinux-ed15e8880fc3d8d52bc02a02521054bfcb26264a.tar.xz
Merge 4.2-rc3 into staging-next
We need the staging fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/pinctrl/spear/pinctrl-spear.c')
-rw-r--r--drivers/pinctrl/spear/pinctrl-spear.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pinctrl/spear/pinctrl-spear.c b/drivers/pinctrl/spear/pinctrl-spear.c
index f87a5eaf75da..0afaf79a4e51 100644
--- a/drivers/pinctrl/spear/pinctrl-spear.c
+++ b/drivers/pinctrl/spear/pinctrl-spear.c
@@ -2,7 +2,7 @@
* Driver for the ST Microelectronics SPEAr pinmux
*
* Copyright (C) 2012 ST Microelectronics
- * Viresh Kumar <viresh.linux@gmail.com>
+ * Viresh Kumar <vireshk@kernel.org>
*
* Inspired from:
* - U300 Pinctl drivers