Merge commit 'v3.0' into x86/vdso

[mirror_ubuntu-artful-kernel.git] / sound / atmel / abdac.c

diff --git a/sound/atmel/abdac.c b/sound/atmel/abdac.c
index 6e24091818950edc9c298241be2d28a751b39f83..bfee60c4d4c0e21386a39982f020350b446c4835 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>");