diff options
| author | Arjan van de Ven <arjan@linux.intel.com> | 2008-10-17 12:20:26 -0400 |
|---|---|---|
| committer | Arjan van de Ven <arjan@linux.intel.com> | 2008-10-17 12:20:26 -0400 |
| commit | 651dab4264e4ba0e563f5ff56f748127246e9065 (patch) | |
| tree | 016630974bdcb00fe529b673f96d389e0fd6dc94 /sound/oss/ac97_codec.c | |
| parent | 40b8606253552109815786e5d4b0de98782d31f5 (diff) | |
| parent | 2e532d68a2b3e2aa6b19731501222069735c741c (diff) | |
Merge commit 'linus/master' into merge-linus
Conflicts:
arch/x86/kvm/i8254.c
Diffstat (limited to 'sound/oss/ac97_codec.c')
| -rw-r--r-- | sound/oss/ac97_codec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/oss/ac97_codec.c b/sound/oss/ac97_codec.c index b63839e8f9bd..456a1b4d7832 100644 --- a/sound/oss/ac97_codec.c +++ b/sound/oss/ac97_codec.c | |||
| @@ -30,7 +30,7 @@ | |||
| 30 | ************************************************************************** | 30 | ************************************************************************** |
| 31 | * | 31 | * |
| 32 | * History | 32 | * History |
| 33 | * May 02, 2003 Liam Girdwood <liam.girdwood@wolfsonmicro.com> | 33 | * May 02, 2003 Liam Girdwood <lrg@slimlogic.co.uk> |
| 34 | * Removed non existant WM9700 | 34 | * Removed non existant WM9700 |
| 35 | * Added support for WM9705, WM9708, WM9709, WM9710, WM9711 | 35 | * Added support for WM9705, WM9708, WM9709, WM9710, WM9711 |
| 36 | * WM9712 and WM9717 | 36 | * WM9712 and WM9717 |