| commit | a29fb94ff48cba620e1ac1317f5eef5920ead3ff | [log] [tgz] |
|---|---|---|
| author | Takashi Iwai <tiwai@suse.de> | Tue Jan 12 09:40:08 2010 +0100 |
| committer | Takashi Iwai <tiwai@suse.de> | Tue Jan 12 09:40:08 2010 +0100 |
| tree | 2fb8e026712bdf7848ea400e25118f6a58824a02 | |
| parent | 52a7a5835173af61b9f6c3038212370d9717526f [diff] | |
| parent | dd3533eca859a6debb1565503ec03e68354e08e0 [diff] |
Merge commit alsa/devel into topic/misc Conflicts: include/sound/version.h