| commit | 156366d31524dc6b88836f06dccb1be13dbef5f1 | [log] [tgz] |
|---|---|---|
| author | Takashi Iwai <tiwai@suse.de> | Tue Mar 02 11:27:46 2010 +0100 |
| committer | Takashi Iwai <tiwai@suse.de> | Tue Mar 02 11:27:46 2010 +0100 |
| tree | 5ae1fee7169edd9bebace22394f0777af21fca63 | |
| parent | 7f9320d415fab5c05097c77eea7a77f2f6341f24 [diff] | |
| parent | 0a566ec25627bdd360f7294aa2e52f9d121233b4 [diff] |
Merge remote branch 'alsa/devel' into topic/misc Conflicts: sound/usb/usbaudio.c