diff options
| author | Len Brown <len.brown@intel.com> | 2008-10-22 23:57:26 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-10-23 00:11:07 -0400 |
| commit | 057316cc6a5b521b332a1d7ccc871cd60c904c74 (patch) | |
| tree | 4333e608da237c73ff69b10878025cca96dcb4c8 /sound/oss/ac97_codec.c | |
| parent | 3e2dab9a1c2deb03c311eb3f83466009147ed4d3 (diff) | |
| parent | 2515ddc6db8eb49a79f0fe5e67ff09ac7c81eab4 (diff) | |
Merge branch 'linus' into test
Conflicts:
MAINTAINERS
arch/x86/kernel/acpi/boot.c
arch/x86/kernel/acpi/sleep.c
drivers/acpi/Kconfig
drivers/pnp/Makefile
drivers/pnp/quirks.c
Signed-off-by: Len Brown <len.brown@intel.com>
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 b63839e8f9b..456a1b4d783 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 |