Merge remote branch 'origin' into secretlab/next-devicetree

Merging in current state of Linus' tree to deal with merge conflicts and
build failures in vio.c after merge.

Conflicts:
	drivers/i2c/busses/i2c-cpm.c
	drivers/i2c/busses/i2c-mpc.c
	drivers/net/gianfar.c

Also fixed up one line in arch/powerpc/kernel/vio.c to use the
correct node pointer.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

1 files changed, 1 insertions, 1 deletions

diff --git a/sound/soc/codecs/ak4104.c b/sound/soc/codecs/ak4104.c
index bdeb10dfd887..192aebda3029 100644
--- a/sound/soc/codecs/ak4104.c
+++ b/sound/soc/codecs/ak4104.c
@@ -222,7 +222,7 @@ static int ak4104_spi_probe(struct spi_device *spi)
         codec->owner = THIS_MODULE;
         codec->dai = &ak4104_dai;
         codec->num_dai = 1;
-        codec->private_data = ak4104;
+        snd_soc_codec_set_drvdata(codec, ak4104);
         codec->control_data = spi;
         codec->reg_cache = ak4104->reg_cache;
         codec->reg_cache_size = AK4104_NUM_REGS;