diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-07-20 03:42:59 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-07-20 03:42:59 -0400 |
| commit | 9ff561fdf73493d757bbc74aa58627e1381650fb (patch) | |
| tree | 4484d230662126b1ac94ea545ca5429c91e0a68b /Documentation/arm/SPEAr | |
| parent | 7b98cf0cf4e8798b9e7435f966ed0d90a2a925de (diff) | |
| parent | fdd85ec3eb8cc1b663678a3efa16ee59a32e0277 (diff) | |
Merge branch 'common/pinctrl' into sh-latest
Diffstat (limited to 'Documentation/arm/SPEAr')
| -rw-r--r-- | Documentation/arm/SPEAr/overview.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/arm/SPEAr/overview.txt b/Documentation/arm/SPEAr/overview.txt index 57aae7765c74..65610bf52ebf 100644 --- a/Documentation/arm/SPEAr/overview.txt +++ b/Documentation/arm/SPEAr/overview.txt | |||
| @@ -60,4 +60,4 @@ Introduction | |||
| 60 | Document Author | 60 | Document Author |
| 61 | --------------- | 61 | --------------- |
| 62 | 62 | ||
| 63 | Viresh Kumar <viresh.kumar@st.com>, (c) 2010-2012 ST Microelectronics | 63 | Viresh Kumar <viresh.linux@gmail.com>, (c) 2010-2012 ST Microelectronics |