Commit 39570721 authored Feb 03, 2009 by Takashi Iwai

Merge branch 'fix/asoc' into topic/asoc

parents a6c255e0 64ca0404

sound/soc/atmel/atmel_ssc_dai.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -10,7 +10,7 @@
		* Based on at91-ssc.c by
		* Frank Mandarino <fmandarino@endrelia.com>
		* 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
		* it under the terms of the GNU General Public License as published by

sound/soc/atmel/atmel_ssc_dai.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -10,7 +10,7 @@
		* Based on at91-ssc.c by
		* Frank Mandarino <fmandarino@endrelia.com>
		* 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
		* it under the terms of the GNU General Public License as published by

sound/soc/codecs/wm8350.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -3,7 +3,7 @@
		*
		* 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
		* it under the terms of the GNU General Public License version 2 as

sound/soc/codecs/wm8990.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -2,8 +2,7 @@
		* wm8990.c -- WM8990 ALSA Soc Audio driver
		*
		* Copyright 2008 Wolfson Microelectronics PLC.
		* Author: Liam Girdwood
		* lg@opensource.wolfsonmicro.com or linux@wolfsonmicro.com
		* Author: Liam Girdwood <lrg@slimlogic.co.uk>
		*
		* 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