Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 42bef686 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-3.1' into for-3.2

parents 4c54c6de 7ec41ee5

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -4604,7 +4604,7 @@ F: arch/arm/mach-omap2/clockdomain2xxx_3xxx.c 
F:	arch/arm/mach-omap2/clockdomain44xx.c



OMAP AUDIO SUPPORT

M:	Jarkko Nikula <jhnikula@gmail.com>

M:	Jarkko Nikula <jarkko.nikula@bitmer.com>

L:	alsa-devel@alsa-project.org (subscribers-only)

L:	linux-omap@vger.kernel.org

S:	Maintained

include/sound/tlv320aic3x.h

+1 −1
Original line number Diff line number Diff line 
/*

 * Platform data for Texas Instruments TLV320AIC3x codec

 *

 * Author: Jarkko Nikula <jhnikula@gmail.com>

 * Author: Jarkko Nikula <jarkko.nikula@bitmer.com>

 *

 * 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/omap/n810.c

+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
 *

 * Copyright (C) 2008 Nokia Corporation

 *

 * Contact: Jarkko Nikula <jhnikula@gmail.com>

 * Contact: Jarkko Nikula <jarkko.nikula@bitmer.com>

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License
@@ -402,6 +402,6 @@ static void __exit n810_soc_exit(void) 
module_init(n810_soc_init);

module_exit(n810_soc_exit);



MODULE_AUTHOR("Jarkko Nikula <jhnikula@gmail.com>");

MODULE_AUTHOR("Jarkko Nikula <jarkko.nikula@bitmer.com>");

MODULE_DESCRIPTION("ALSA SoC Nokia N810");

MODULE_LICENSE("GPL");

sound/soc/omap/omap-mcbsp.c

+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
 *

 * Copyright (C) 2008 Nokia Corporation

 *

 * Contact: Jarkko Nikula <jhnikula@gmail.com>

 * Contact: Jarkko Nikula <jarkko.nikula@bitmer.com>

 *          Peter Ujfalusi <peter.ujfalusi@ti.com>

 *

 * This program is free software; you can redistribute it and/or
@@ -780,6 +780,6 @@ static void __exit snd_omap_mcbsp_exit(void) 
}

module_exit(snd_omap_mcbsp_exit);



MODULE_AUTHOR("Jarkko Nikula <jhnikula@gmail.com>");

MODULE_AUTHOR("Jarkko Nikula <jarkko.nikula@bitmer.com>");

MODULE_DESCRIPTION("OMAP I2S SoC Interface");

MODULE_LICENSE("GPL");

sound/soc/omap/omap-mcbsp.h

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
 *

 * Copyright (C) 2008 Nokia Corporation

 *

 * Contact: Jarkko Nikula <jhnikula@gmail.com>

 * Contact: Jarkko Nikula <jarkko.nikula@bitmer.com>

 *          Peter Ujfalusi <peter.ujfalusi@ti.com>

 *

 * This program is free software; you can redistribute it and/or