Merge remote-tracking branch 'asoc/topic/pcm512x' into asoc-next

diff --git a/sound/soc/codecs/pcm512x-i2c.c b/sound/soc/codecs/pcm512x-i2c.c
index dbff416e38be760f20675b0a44401cb03a5d557b..5f9c069569d5a9802cd988e8dad9d1a17ff42826 100644 (file)
--- a/sound/soc/codecs/pcm512x-i2c.c
+++ b/sound/soc/codecs/pcm512x-i2c.c
@@ -1,7 +1,7 @@
 /*
  * Driver for the PCM512x CODECs
  *
- * Author:     Mark Brown <broonie@linaro.org>
+ * Author:     Mark Brown <broonie@kernel.org>
  *             Copyright 2014 Linaro Ltd
  *
  * This program is free software; you can redistribute it and/or
@@ -75,5 +75,5 @@ static struct i2c_driver pcm512x_i2c_driver = {
 module_i2c_driver(pcm512x_i2c_driver);
 
 MODULE_DESCRIPTION("ASoC PCM512x codec driver - I2C");
-MODULE_AUTHOR("Mark Brown <broonie@linaro.org>");
+MODULE_AUTHOR("Mark Brown <broonie@kernel.org>");
 MODULE_LICENSE("GPL v2");

diff --git a/sound/soc/codecs/pcm512x-spi.c b/sound/soc/codecs/pcm512x-spi.c
index 712ed6598c4827c5c4780d3df8d341fc7b39fd9c..25c63510ae1553f698eee4f40c5b5ae8d211be27 100644 (file)
--- a/sound/soc/codecs/pcm512x-spi.c
+++ b/sound/soc/codecs/pcm512x-spi.c
@@ -1,7 +1,7 @@
 /*
  * Driver for the PCM512x CODECs
  *
- * Author:     Mark Brown <broonie@linaro.org>
+ * Author:     Mark Brown <broonie@kernel.org>
  *             Copyright 2014 Linaro Ltd
  *
  * This program is free software; you can redistribute it and/or

diff --git a/sound/soc/codecs/pcm512x.c b/sound/soc/codecs/pcm512x.c
index 68feae262476492ae3a0b30855dbb09e96fa187e..e0f3556d38729486fe937022cc271dd136a8c0eb 100644 (file)
--- a/sound/soc/codecs/pcm512x.c
+++ b/sound/soc/codecs/pcm512x.c
@@ -1,7 +1,7 @@
 /*
  * Driver for the PCM512x CODECs
  *
- * Author:     Mark Brown <broonie@linaro.org>
+ * Author:     Mark Brown <broonie@kernel.org>
  *             Copyright 2014 Linaro Ltd
  *
  * This program is free software; you can redistribute it and/or
@@ -1602,5 +1602,5 @@ const struct dev_pm_ops pcm512x_pm_ops = {
 EXPORT_SYMBOL_GPL(pcm512x_pm_ops);
 
 MODULE_DESCRIPTION("ASoC PCM512x codec driver");
-MODULE_AUTHOR("Mark Brown <broonie@linaro.org>");
+MODULE_AUTHOR("Mark Brown <broonie@kernel.org>");
 MODULE_LICENSE("GPL v2");

diff --git a/sound/soc/codecs/pcm512x.h b/sound/soc/codecs/pcm512x.h
index b7c3102072232336feedc6e9af7dc5e14bfffdb6..d70d9c0c2088c57da901161bc6e4301f6752fa52 100644 (file)
--- a/sound/soc/codecs/pcm512x.h
+++ b/sound/soc/codecs/pcm512x.h
@@ -1,7 +1,7 @@
 /*
  * Driver for the PCM512x CODECs
  *
- * Author:     Mark Brown <broonie@linaro.org>
+ * Author:     Mark Brown <broonie@kernel.org>
  *             Copyright 2014 Linaro Ltd
  *
  * This program is free software; you can redistribute it and/or