diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-11-26 14:12:42 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-11-26 14:12:42 +0100 |
| commit | e7dd8c1bdacf658b0ade51facb2f7eaf40eb0ac4 (patch) | |
| tree | 0db15820fdd391a1570e1257167e8f02532c83f5 /include/sound/version.h | |
| parent | ed313489badef16d700f5a3be50e8fd8f8294bc8 (diff) | |
| parent | bc4a68fed4b4c01005ef3c71ede6a8cbe91b7dc9 (diff) | |
| download | op-kernel-dev-e7dd8c1bdacf658b0ade51facb2f7eaf40eb0ac4.zip op-kernel-dev-e7dd8c1bdacf658b0ade51facb2f7eaf40eb0ac4.tar.gz | |
Merge branch 'topic/misc' into topic/pcsp-fix
Conflicts:
sound/drivers/pcsp/pcsp_lib.c
Diffstat (limited to 'include/sound/version.h')
| -rw-r--r-- | include/sound/version.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sound/version.h b/include/sound/version.h index 4aafeda..2b48237 100644 --- a/include/sound/version.h +++ b/include/sound/version.h @@ -1,3 +1,3 @@ /* include/version.h */ -#define CONFIG_SND_VERSION "1.0.18rc3" +#define CONFIG_SND_VERSION "1.0.18a" #define CONFIG_SND_DATE "" |
