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

Conflicts:
	arch/arm/mach-s3c64xx/mach-crag6410.c

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/mach-s3c64xx/mach-crag6410.c
index 6ff76c0d9d5c90fe2b0a12a4c559b103766aab11,55c0e75f5edc314fdafe3693df34b6ab410f3398..85b79ec827d828cfbf066c5cd8fedcd07e8f4a22
--- 1/arch/arm/mach-s3c64xx/mach-crag6410.c
--- 2/arch/arm/mach-s3c64xx/mach-crag6410.c
+++ b/arch/arm/mach-s3c64xx/mach-crag6410.c
@@@ -346,8 -338,7 +346,8 @@@ static struct platform_device *crag6410
        &crag6410_lcd_powerdev,
        &crag6410_backlight_device,
        &speyside_device,
-       &speyside_wm8962_device,
+       &tobermory_device,
 +      &littlemill_device,
        &lowland_device,
        &wallvdd_device,
  };