diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-04-30 19:08:06 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-04-30 19:08:06 +0200 |
| commit | 0ae3aba2865a5a6f5ee82e9651f0a69daf19d79c (patch) | |
| tree | ca4884719ad40ba247df7954d8d7cf86b9a01239 /include/sound/designware_i2s.h | |
| parent | 7241ea558c6715501e777396b5fc312c372e11d9 (diff) | |
| parent | d839c98f98826f0c13e46d5a4cecb46dd357b50e (diff) | |
Merge tag 'asoc-v4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v4.1
A few fixes for v4.1, none earth shattering and mostly driver related
except for one change to fix !PM builds for Intel platforms which is
done by adding stubs in the core so other platforms don't run into the
same issue.
Diffstat (limited to 'include/sound/designware_i2s.h')
| -rw-r--r-- | include/sound/designware_i2s.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sound/designware_i2s.h b/include/sound/designware_i2s.h index 26f406e0f673..3a8fca9409a7 100644 --- a/include/sound/designware_i2s.h +++ b/include/sound/designware_i2s.h @@ -1,5 +1,5 @@ /* - * Copyright (ST) 2012 Rajeev Kumar (rajeev-dlh.kumar@st.com) + * Copyright (ST) 2012 Rajeev Kumar (rajeevkumar.linux@gmail.com) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by |