Merge branch 'for-2.6.32' into for-2.6.33

This commit is contained in:
Mark Brown
2009-11-18 13:54:51 +00:00
3 changed files with 4 additions and 3 deletions

View File

@@ -151,4 +151,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");