diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-25 09:16:12 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-25 09:16:12 -0700 |
| commit | 889e5528cbe7dff2e91caf48f4bb23c17748b984 (patch) | |
| tree | af66c15b48efb49926c475bbb4f33f48e1a76c40 /drivers/clk/spear/clk.c | |
| parent | ff446f2001cf9b5ed97c6256c4ee3549d3b7abed (diff) | |
| parent | 6b16351acbd415e66ba16bf7d473ece1574cf0bc (diff) | |
| download | talos-op-linux-889e5528cbe7dff2e91caf48f4bb23c17748b984.tar.gz talos-op-linux-889e5528cbe7dff2e91caf48f4bb23c17748b984.zip | |
Merge 3.5-rc4 into usb-next
This is to get the USB fixes that were merged in the 3.5-rc4 tree into usb-next
so that everyone can sync up properly.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.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 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 |
