diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-25 18:31:00 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-25 18:31:00 +0200 |
| commit | bcc66c0b8881f88459f9ac21038455bcafacdc6e (patch) | |
| tree | b402e677253c3fc1038ca4a52fc54fc223261133 /drivers/clk/spear/clk-frac-synth.c | |
| parent | staging: r8712u: Remove useless driver version info (diff) | |
| parent | Linux 3.5-rc4 (diff) | |
| download | linux-bcc66c0b8881f88459f9ac21038455bcafacdc6e.tar.xz linux-bcc66c0b8881f88459f9ac21038455bcafacdc6e.zip | |
Merge 3.5-rc4 into staging-next
This picks up the staging changes made in 3.5-rc4 so that everyone can sync up
properly.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 |