diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-07-11 08:15:48 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-07-11 08:15:55 -0400 |
| commit | b7e9c223be8ce335e30f2cf6ba588e6a4092275c (patch) | |
| tree | 2d1e3b75606abc18df7ad65e51ac3f90cd68b38d /sound/atmel | |
| parent | c172d82500a6cf3c32d1e650722a1055d72ce858 (diff) | |
| parent | e3bbfa78bab125f58b831b5f7f45b5a305091d72 (diff) | |
Merge branch 'master' into for-next
Sync with Linus' tree to be able to apply pending patches that
are based on newer code already present upstream.
Diffstat (limited to 'sound/atmel')
| -rw-r--r-- | sound/atmel/abdac.c | 2 | ||||
| -rw-r--r-- | sound/atmel/ac97c.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/atmel/abdac.c b/sound/atmel/abdac.c index 30468b31cad8..6fd9391b3a6c 100644 --- a/sound/atmel/abdac.c +++ b/sound/atmel/abdac.c | |||
| @@ -599,4 +599,4 @@ module_exit(atmel_abdac_exit); | |||
| 599 | 599 | ||
| 600 | MODULE_LICENSE("GPL"); | 600 | MODULE_LICENSE("GPL"); |
| 601 | MODULE_DESCRIPTION("Driver for Atmel Audio Bitstream DAC (ABDAC)"); | 601 | MODULE_DESCRIPTION("Driver for Atmel Audio Bitstream DAC (ABDAC)"); |
| 602 | MODULE_AUTHOR("Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>"); | 602 | MODULE_AUTHOR("Hans-Christian Egtvedt <egtvedt@samfundet.no>"); |
diff --git a/sound/atmel/ac97c.c b/sound/atmel/ac97c.c index 41b901bde5c7..6e5addeb236b 100644 --- a/sound/atmel/ac97c.c +++ b/sound/atmel/ac97c.c | |||
| @@ -1199,4 +1199,4 @@ module_exit(atmel_ac97c_exit); | |||
| 1199 | 1199 | ||
| 1200 | MODULE_LICENSE("GPL"); | 1200 | MODULE_LICENSE("GPL"); |
| 1201 | MODULE_DESCRIPTION("Driver for Atmel AC97 controller"); | 1201 | MODULE_DESCRIPTION("Driver for Atmel AC97 controller"); |
| 1202 | MODULE_AUTHOR("Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>"); | 1202 | MODULE_AUTHOR("Hans-Christian Egtvedt <egtvedt@samfundet.no>"); |