diff options
| author | Joerg Roedel <joerg.roedel@amd.com> | 2012-07-17 14:04:20 +0400 |
|---|---|---|
| committer | Joerg Roedel <joerg.roedel@amd.com> | 2012-07-17 14:04:20 +0400 |
| commit | 8ce44a2174c3b07950d7a8d44774e23e60518205 (patch) | |
| tree | 4bf04cdeed59775462d5326d3bcb00c7343b6163 /drivers/clk/spear/clk-frac-synth.c | |
| parent | f9a4f063a88297e361fd6676986cf3e39b22de72 (diff) | |
| parent | 84a1caf1453c3d44050bd22db958af4a7f99315c (diff) | |
| download | linux-8ce44a2174c3b07950d7a8d44774e23e60518205.tar.xz | |
Merge tag 'v3.5-rc7' into arm/tegra
This solves the merge conflicts while creating the next
branch.
Linux 3.5-rc7
Conflicts:
drivers/iommu/tegra-smmu.c
Diffstat (limited to 'drivers/clk/spear/clk-frac-synth.c')
| -rw-r--r-- | drivers/clk/spear/clk-frac-synth.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/spear/clk-frac-synth.c b/drivers/clk/spear/clk-frac-synth.c index 4dbdb3fe18e0..958aa3ad1d60 100644 --- a/drivers/clk/spear/clk-frac-synth.c +++ b/drivers/clk/spear/clk-frac-synth.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 |