From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Sat, 22 Sep 2012 15:26:27 +0000 (-0400)
Subject: Merge tag 'v3.6-rc6' into for-3.7
X-Git-Tag: firefly_0821_release~3680^2~1589^2~52^2~32
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ddfb43f3881edb47aa0083651ad31983cdc42c33;p=firefly-linux-kernel-4.4.55.git

Merge tag 'v3.6-rc6' into for-3.7

Linux 3.6-rc6 has all our bug fixes.

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

ddfb43f3881edb47aa0083651ad31983cdc42c33
diff --cc drivers/mfd/twl4030-audio.c
index 58e6c228653b,77c9acb14583..5c11acf9e0fd
--- a/drivers/mfd/twl4030-audio.c
+++ b/drivers/mfd/twl4030-audio.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;