Merge tag 'v3.6-rc6' into for-3.7
Mark Brown [Sat, 22 Sep 2012 15:26:27 +0000 (11:26 -0400)]
Linux 3.6-rc6 has all our bug fixes.

Conflicts (trivial overlap):
sound/soc/omap/am3517evm.c

1  2 
arch/arm/mach-omap2/omap_hwmod_44xx_data.c
drivers/mfd/twl4030-audio.c
sound/soc/codecs/arizona.c
sound/soc/codecs/mc13783.c
sound/soc/codecs/wm8904.c
sound/soc/soc-dapm.c
sound/soc/ux500/ux500_msp_i2s.c

@@@ -250,12 -221,9 +250,12 @@@ static int __devinit twl4030_audio_prob
                childs++;
        }
  
 +      platform_set_drvdata(pdev, audio);
 +      twl4030_audio_dev = pdev;
 +
        if (childs)
                ret = mfd_add_devices(&pdev->dev, pdev->id, audio->cells,
-                                     childs, NULL, 0);
+                                     childs, NULL, 0, NULL);
        else {
                dev_err(&pdev->dev, "No platform data found for childs\n");
                ret = -ENODEV;
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge