| commit | 156366d31524dc6b88836f06dccb1be13dbef5f1 | |
| author | Takashi Iwai <tiwai@suse.de> | |
| Tue, 2 Mar 2010 10:27:46 +0000 (2 11:27 +0100) | ||
| committer | Takashi Iwai <tiwai@suse.de> | |
| Tue, 2 Mar 2010 10:27:46 +0000 (2 11:27 +0100) | ||
| tree | 5ae1fee7169edd9bebace22394f0777af21fca63 | treesnapshot (tar.gz zip) |
| parent | 7f9320d415fab5c05097c77eea7a77f2f6341f24 | commitdiff |
| parent | 0a566ec25627bdd360f7294aa2e52f9d121233b4 | commitdiff |
Merge remote branch 'alsa/devel' into topic/misc
Conflicts:
sound/usb/usbaudio.c
Conflicts:
sound/usb/usbaudio.c
| sound/usb/usbaudio.c | diff1 | diff2 | blobhistory |
| sound/usb/usbaudio.h | diff1 | diff2 | blobhistory |
| sound/usb/usbquirks.h | diff1 | diff2 | blobhistory |