Skip to content

L
linux-davinci
Commit 39570721 authored by Takashi Iwai's avatar Takashi Iwai
Browse files
Options

Merge branch 'fix/asoc' into topic/asoc

parents a6c255e0 64ca0404
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 5 deletions
sound/soc/atmel/atmel_ssc_dai.c
View file @ 39570721
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
* Based on at91-ssc.c by * Based on at91-ssc.c by
* Frank Mandarino <fmandarino@endrelia.com> * Frank Mandarino <fmandarino@endrelia.com>
* Based on pxa2xx Platform drivers by * Based on pxa2xx Platform drivers by
* Liam Girdwood <liam.girdwood@wolfsonmicro.com> * Liam Girdwood <lrg@slimlogic.co.uk>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
......
sound/soc/atmel/atmel_ssc_dai.h
View file @ 39570721
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
* Based on at91-ssc.c by * Based on at91-ssc.c by
* Frank Mandarino <fmandarino@endrelia.com> * Frank Mandarino <fmandarino@endrelia.com>
* Based on pxa2xx Platform drivers by * Based on pxa2xx Platform drivers by
* Liam Girdwood <liam.girdwood@wolfsonmicro.com> * Liam Girdwood <lrg@slimlogic.co.uk>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
......
sound/soc/codecs/wm8350.c
View file @ 39570721
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* *
* Copyright (C) 2007, 2008 Wolfson Microelectronics PLC. * Copyright (C) 2007, 2008 Wolfson Microelectronics PLC.
* *
* Author: Liam Girdwood <lg@opensource.wolfsonmicro.com> * Author: Liam Girdwood <lrg@slimlogic.co.uk>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as * it under the terms of the GNU General Public License version 2 as
......
sound/soc/codecs/wm8990.c
View file @ 39570721
...@@ -2,8 +2,7 @@ ...@@ -2,8 +2,7 @@
* wm8990.c -- WM8990 ALSA Soc Audio driver * wm8990.c -- WM8990 ALSA Soc Audio driver
* *
* Copyright 2008 Wolfson Microelectronics PLC. * Copyright 2008 Wolfson Microelectronics PLC.
* Author: Liam Girdwood * Author: Liam Girdwood <lrg@slimlogic.co.uk>
* lg@opensource.wolfsonmicro.com or linux@wolfsonmicro.com
* *
* This program is free software; you can redistribute it and/or modify it * This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the * under the terms of the GNU General Public License as published by the
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment