diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-07-04 09:12:50 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-07-04 09:12:50 +0200 |
| commit | f68d891d85c8f9ab1af663ed3ceac18ad58dbabe (patch) | |
| tree | d92db7af512307ab5282eb62f3dd1741ac71d21f /Documentation/arm/SPEAr/overview.txt | |
| parent | ALSA: hda - give 3-pin jack the name "Headphone Mic Jack" (diff) | |
| parent | ALSA: hda - Avoid possible race of beep on/off (diff) | |
| download | linux-f68d891d85c8f9ab1af663ed3ceac18ad58dbabe.tar.xz linux-f68d891d85c8f9ab1af663ed3ceac18ad58dbabe.zip | |
Merge branch 'topic/hda-beep' into topic/hda
Diffstat (limited to 'Documentation/arm/SPEAr/overview.txt')
| -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 Document Author --------------- - Viresh Kumar <viresh.kumar@st.com>, (c) 2010-2012 ST Microelectronics + Viresh Kumar <viresh.linux@gmail.com>, (c) 2010-2012 ST Microelectronics |