Merge branch 'master' into for-next

[karo-tx-linux.git] / sound / atmel / abdac.c

diff --git a/sound/atmel/abdac.c b/sound/atmel/abdac.c
index 30468b31cad8e81ab239344624d35c08c8564d33..6fd9391b3a6cd1c4aeb60d791effd9edd985ac18 100644 (file)
--- a/sound/atmel/abdac.c
+++ b/sound/atmel/abdac.c
@@ -599,4 +599,4 @@ module_exit(atmel_abdac_exit);
 
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("Driver for Atmel Audio Bitstream DAC (ABDAC)");
-MODULE_AUTHOR("Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>");
+MODULE_AUTHOR("Hans-Christian Egtvedt <egtvedt@samfundet.no>");