summaryrefslogtreecommitdiff
path: root/drivers/clk/spear/clk.h
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2012-09-05 18:17:42 +0400
committerJohannes Berg <johannes.berg@intel.com>2012-09-05 18:17:42 +0400
commit188ce5abebf56ec732f652abe608b94c317e4963 (patch)
tree23bda38c221abb46b566a1aef36029eab00a50b9 /drivers/clk/spear/clk.h
parent362b0563b28506d534a82d9c6cd5fdf58783fda6 (diff)
parenta4881cc45a3fab4488e16c4934e149cfa620f1a9 (diff)
downloadlinux-188ce5abebf56ec732f652abe608b94c317e4963.tar.xz
Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next
Diffstat (limited to 'drivers/clk/spear/clk.h')
-rw-r--r--drivers/clk/spear/clk.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/spear/clk.h b/drivers/clk/spear/clk.h
index 3321c46a071c..931737677dfa 100644
--- a/drivers/clk/spear/clk.h
+++ b/drivers/clk/spear/clk.h
@@ -2,7 +2,7 @@
* Clock framework definitions for SPEAr platform
*
* Copyright (C) 2012 ST Microelectronics
- * Viresh Kumar <viresh.kumar@st.com>
+ * Viresh Kumar <viresh.linux@gmail.com>
*
* This file is licensed under the terms of the GNU General Public
* License version 2. This program is licensed "as is" without any