diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-07-21 07:57:44 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-07-21 07:57:44 +0200 |
| commit | f6a74a5e15df32f289837feeabf8c84829312b06 (patch) | |
| tree | c8d16b12ef76c7a9e21693d1bad31f59f78436cd /drivers/clk/spear/clk.c | |
| parent | 60cd37eb100c4880b28078a47f3062fac7572095 (diff) | |
| parent | 9d634c410b07be7bf637ea03362d3ff132088fe3 (diff) | |
| download | op-kernel-dev-f6a74a5e15df32f289837feeabf8c84829312b06.zip op-kernel-dev-f6a74a5e15df32f289837feeabf8c84829312b06.tar.gz | |
Merge branch 'linus' into perf/core, to refresh the branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/clk/spear/clk.c')
| -rw-r--r-- | drivers/clk/spear/clk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/spear/clk.c b/drivers/clk/spear/clk.c index 628b6d5..157fe09 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.linux@gmail.com> + * Viresh Kumar <vireshk@kernel.org> * * This file is licensed under the terms of the GNU General Public * License version 2. This program is licensed "as is" without any |
