Merge branch 'for-2.6.40' of... (4a787a3f) · Commits · e / devices / android_kernel_teracube_2e

MAINTAINERS

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -5840,7 +5840,7 @@ F: include/sound/
	F: sound/		F: sound/

	SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC)		SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC)
	M: Liam Girdwood <lrg@slimlogic.co.uk>		M: Liam Girdwood <lrg@ti.com>
	M: Mark Brown <broonie@opensource.wolfsonmicro.com>		M: Mark Brown <broonie@opensource.wolfsonmicro.com>
	T: git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git		T: git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git
	L: alsa-devel@alsa-project.org (moderated for non-subscribers)		L: alsa-devel@alsa-project.org (moderated for non-subscribers)
	@@ -6093,7 +6093,7 @@ F: drivers/mmc/host/tifm_sd.c
	F: include/linux/tifm.h		F: include/linux/tifm.h

	TI TWL4030 SERIES SOC CODEC DRIVER		TI TWL4030 SERIES SOC CODEC DRIVER
	M: Peter Ujfalusi <peter.ujfalusi@nokia.com>		M: Peter Ujfalusi <peter.ujfalusi@ti.com>
	L: alsa-devel@alsa-project.org (moderated for non-subscribers)		L: alsa-devel@alsa-project.org (moderated for non-subscribers)
	S: Maintained		S: Maintained
	F: sound/soc/codecs/twl4030*		F: sound/soc/codecs/twl4030*
	@@ -6736,7 +6736,7 @@ F: drivers/scsi/vmw_pvscsi.c
	F: drivers/scsi/vmw_pvscsi.h		F: drivers/scsi/vmw_pvscsi.h

	VOLTAGE AND CURRENT REGULATOR FRAMEWORK		VOLTAGE AND CURRENT REGULATOR FRAMEWORK
	M: Liam Girdwood <lrg@slimlogic.co.uk>		M: Liam Girdwood <lrg@ti.com>
	M: Mark Brown <broonie@opensource.wolfsonmicro.com>		M: Mark Brown <broonie@opensource.wolfsonmicro.com>
	W: http://opensource.wolfsonmicro.com/node/15		W: http://opensource.wolfsonmicro.com/node/15
	W: http://www.slimlogic.co.uk/?p=48		W: http://www.slimlogic.co.uk/?p=48

include/sound/tlv320dac33-plat.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	/*		/*
	* Platform header for Texas Instruments TLV320DAC33 codec driver		* Platform header for Texas Instruments TLV320DAC33 codec driver
	*		*
	* Author: Peter Ujfalusi <peter.ujfalusi@nokia.com>		* Author: Peter Ujfalusi <peter.ujfalusi@ti.com>
	*		*
	* Copyright: (C) 2009 Nokia Corporation		* Copyright: (C) 2009 Nokia Corporation
	*		*

include/sound/tpa6130a2-plat.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -3,7 +3,7 @@
	*		*
	* Copyright (C) Nokia Corporation		* Copyright (C) Nokia Corporation
	*		*
	* Written by Peter Ujfalusi <peter.ujfalusi@nokia.com>		* Author: Peter Ujfalusi <peter.ujfalusi@ti.com>
	*		*
	* This program is free software; you can redistribute it and/or		* This program is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License		* modify it under the terms of the GNU General Public License

sound/soc/codecs/tlv320dac33.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	/*		/*
	* ALSA SoC Texas Instruments TLV320DAC33 codec driver		* ALSA SoC Texas Instruments TLV320DAC33 codec driver
	*		*
	* Author: Peter Ujfalusi <peter.ujfalusi@nokia.com>		* Author: Peter Ujfalusi <peter.ujfalusi@ti.com>
	*		*
	* Copyright: (C) 2009 Nokia Corporation		* Copyright: (C) 2009 Nokia Corporation
	*		*
	@@ -1658,5 +1658,5 @@ module_exit(dac33_module_exit);


	MODULE_DESCRIPTION("ASoC TLV320DAC33 codec driver");		MODULE_DESCRIPTION("ASoC TLV320DAC33 codec driver");
	MODULE_AUTHOR("Peter Ujfalusi <peter.ujfalusi@nokia.com>");		MODULE_AUTHOR("Peter Ujfalusi <peter.ujfalusi@ti.com>");
	MODULE_LICENSE("GPL");		MODULE_LICENSE("GPL");

sound/soc/codecs/tlv320dac33.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	/*		/*
	* ALSA SoC Texas Instruments TLV320DAC33 codec driver		* ALSA SoC Texas Instruments TLV320DAC33 codec driver
	*		*
	* Author: Peter Ujfalusi <peter.ujfalusi@nokia.com>		* Author: Peter Ujfalusi <peter.ujfalusi@ti.com>
	*		*
	* Copyright: (C) 2009 Nokia Corporation		* Copyright: (C) 2009 Nokia Corporation
	*		*