diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-02-03 07:07:15 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-02-03 07:07:15 +0100 |
| commit | 395707212a53999427bd160abd6541bffe062033 (patch) | |
| tree | bba0072e678e184879d010354d53a3e183fe43a8 /sound/soc/atmel | |
| parent | a6c255e0945160b76eabe983f59e2129e0c66246 (diff) | |
| parent | 64ca0404eed57f6c92290d55e949a7f46cbe4bf4 (diff) | |
| download | linux-395707212a53999427bd160abd6541bffe062033.tar.bz2 | |
Merge branch 'fix/asoc' into topic/asoc
Diffstat (limited to 'sound/soc/atmel')
| -rw-r--r-- | sound/soc/atmel/atmel_ssc_dai.c | 2 | ||||
| -rw-r--r-- | sound/soc/atmel/atmel_ssc_dai.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/atmel/atmel_ssc_dai.c b/sound/soc/atmel/atmel_ssc_dai.c index c5d67900d666..ff0054b76502 100644 --- a/sound/soc/atmel/atmel_ssc_dai.c +++ b/sound/soc/atmel/atmel_ssc_dai.c @@ -10,7 +10,7 @@ * Based on at91-ssc.c by * Frank Mandarino <fmandarino@endrelia.com> * Based on pxa2xx Platform drivers by - * Liam Girdwood <liam.girdwood@wolfsonmicro.com> + * Liam Girdwood <lrg@slimlogic.co.uk> * * 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 diff --git a/sound/soc/atmel/atmel_ssc_dai.h b/sound/soc/atmel/atmel_ssc_dai.h index a828746e8a2f..391135f9c6c1 100644 --- a/sound/soc/atmel/atmel_ssc_dai.h +++ b/sound/soc/atmel/atmel_ssc_dai.h @@ -10,7 +10,7 @@ * Based on at91-ssc.c by * Frank Mandarino <fmandarino@endrelia.com> * Based on pxa2xx Platform drivers by - * Liam Girdwood <liam.girdwood@wolfsonmicro.com> + * Liam Girdwood <lrg@slimlogic.co.uk> * * 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 |