summaryrefslogtreecommitdiff
path: root/sound/soc/samsung/i2s.h
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-03-18 21:22:37 +0400
committerTakashi Iwai <tiwai@suse.de>2012-03-18 21:22:37 +0400
commitcb3f2adc03ab055b19c677a6283523861fafebdd (patch)
tree59cfb6800f0635a4aec16c8e0da619f27e51ee79 /sound/soc/samsung/i2s.h
parent44c76a960a62fcc46cbcaa0a22a34e666a729329 (diff)
parent828006de1bddf83b6ecf03ec459c15f7c7c22db7 (diff)
downloadlinux-cb3f2adc03ab055b19c677a6283523861fafebdd.tar.xz
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'sound/soc/samsung/i2s.h')
-rw-r--r--sound/soc/samsung/i2s.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/samsung/i2s.h b/sound/soc/samsung/i2s.h
index 8e15f6a616d1..d420a7ca56ca 100644
--- a/sound/soc/samsung/i2s.h
+++ b/sound/soc/samsung/i2s.h
@@ -3,7 +3,7 @@
* ALSA SoC Audio Layer - Samsung I2S Controller driver
*
* Copyright (c) 2010 Samsung Electronics Co. Ltd.
- * Jaswinder Singh <jassi.brar@samsung.com>
+ * Jaswinder Singh <jassisinghbrar@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as