diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-18 14:59:49 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-18 14:59:49 -0800 |
| commit | 70b172b2989685a16cb47224678b9290d73fcd18 (patch) | |
| tree | b56a073103c8e682acfff97d841a3e15dfbdf10d /sound/soc/omap/omap3evm.c | |
| parent | 486bfe5c7ca6184f35b93b9f2bf3fa3baa1b65e4 (diff) | |
| parent | e2cd52e60726c30fa558cead7bc7413fd946261c (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ASoC: tlv320aic23 fix rate selection
ASoC: OMAP3 Pandora: update for TWL4030 codec changes
ASoC: Modifying the license string GPLv2 for OMAP3 EVM
ALSA: hda - Fix quirk for VAIO type G
ALSA: usb - Quirk to disable master volume control in PCM2702
Diffstat (limited to 'sound/soc/omap/omap3evm.c')
| -rw-r--r-- | sound/soc/omap/omap3evm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/omap/omap3evm.c b/sound/soc/omap/omap3evm.c index 9114c263077..13aa380de16 100644 --- a/sound/soc/omap/omap3evm.c +++ b/sound/soc/omap/omap3evm.c @@ -144,4 +144,4 @@ module_exit(omap3evm_soc_exit); MODULE_AUTHOR("Anuj Aggarwal <anuj.aggarwal@ti.com>"); MODULE_DESCRIPTION("ALSA SoC OMAP3 EVM"); -MODULE_LICENSE("GPLv2"); +MODULE_LICENSE("GPL v2"); |