diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-05 17:25:34 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-05 17:25:34 +0200 |
| commit | 6fbfd0592ef88ba29cdce84ef92757351f1fa9c9 (patch) | |
| tree | 7c0af4bcc08f3ad7befb93d73d9729f82252c950 /drivers/clk/spear/clk-vco-pll.c | |
| parent | Extcon: Arizona: Add driver for Wolfson Arizona class devices (diff) | |
| parent | Linux 3.5-rc5 (diff) | |
| download | linux-6fbfd0592ef88ba29cdce84ef92757351f1fa9c9.tar.xz linux-6fbfd0592ef88ba29cdce84ef92757351f1fa9c9.zip | |
Merge v3.5-rc5 into driver-core-next
This picks up the big printk fixes, and resolves a merge issue with:
drivers/extcon/extcon_gpio.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/clk/spear/clk-vco-pll.c')
| -rw-r--r-- | drivers/clk/spear/clk-vco-pll.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/spear/clk-vco-pll.c b/drivers/clk/spear/clk-vco-pll.c index dcd4bdf4b0d9..5f1b6badeb15 100644 --- a/drivers/clk/spear/clk-vco-pll.c +++ b/drivers/clk/spear/clk-vco-pll.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 |