summaryrefslogtreecommitdiff
path: root/drivers/clk/spear/clk.c
diff options
context:
space:
mode:
authorJens Axboe <axboe@kernel.dk>2012-07-30 11:03:10 +0400
committerJens Axboe <axboe@kernel.dk>2012-07-30 11:03:10 +0400
commit72ea1f74fcdf874cca6d2c0962379523bbd99e2c (patch)
tree4c67be6c73356086ff44ef1b8b1c9479702689ca /drivers/clk/spear/clk.c
parentb1af9be5ef77898c05667bb9dbf3b180d91d3292 (diff)
parenta73ff3231df59a4b92ccd0dd4e73897c5822489b (diff)
downloadlinux-72ea1f74fcdf874cca6d2c0962379523bbd99e2c.tar.xz
Merge branch 'for-jens' of git://git.drbd.org/linux-drbd into for-3.6/drivers
Diffstat (limited to 'drivers/clk/spear/clk.c')
-rw-r--r--drivers/clk/spear/clk.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/spear/clk.c b/drivers/clk/spear/clk.c
index 376d4e5ff326..7cd63788d546 100644
--- a/drivers/clk/spear/clk.c
+++ b/drivers/clk/spear/clk.c
@@ -1,6 +1,6 @@
/*
* 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