Merge remote-tracking branch 'sound-asoc/for-next'

diff --cc arch/arm/mach-shmobile/board-ap4evb.c
Simple merge

diff --cc sound/soc/au1x/db1200.c
index 44ad118273644b32f7110132cbd409a182f53c26,80733331733fb103ef37d112b73bbb87310b1a2b..ec725f63a26a4f1c65ec7dcb77346fd3975f749e
--- 1/sound/soc/au1x/db1200.c
--- 2/sound/soc/au1x/db1200.c
+++ b/sound/soc/au1x/db1200.c
@@@ -202,19 -133,8 +202,8 @@@ static struct platform_driver db1200_au
        .remove         = __devexit_p(db1200_audio_remove),
  };
  
- static int __init db1200_audio_load(void)
- {
-       return platform_driver_register(&db1200_audio_driver);
- }
- 
- static void __exit db1200_audio_unload(void)
- {
-       platform_driver_unregister(&db1200_audio_driver);
- }
- 
- module_init(db1200_audio_load);
- module_exit(db1200_audio_unload);
+ module_platform_driver(db1200_audio_driver);
  
  MODULE_LICENSE("GPL");
 -MODULE_DESCRIPTION("DB1200 ASoC audio support");
 +MODULE_DESCRIPTION("DB1200/DB1300/DB1550 ASoC audio support");
  MODULE_AUTHOR("Manuel Lauss");

diff --cc sound/soc/ep93xx/ep93xx-pcm.c
Simple merge

diff --cc sound/soc/imx/imx-pcm-dma-mx2.c
Simple merge

diff --cc sound/soc/nuc900/nuc900-ac97.c
Simple merge

diff --cc sound/soc/samsung/dma.c
Simple merge

diff --cc sound/soc/txx9/txx9aclc.c
Simple merge