diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-03-02 11:27:46 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-03-02 11:27:46 +0100 |
| commit | 156366d31524dc6b88836f06dccb1be13dbef5f1 (patch) | |
| tree | 5ae1fee7169edd9bebace22394f0777af21fca63 /sound/isa/opti9xx/miro.c | |
| parent | 7f9320d415fab5c05097c77eea7a77f2f6341f24 (diff) | |
| parent | 0a566ec25627bdd360f7294aa2e52f9d121233b4 (diff) | |
| download | kernel_samsung_smdk4412-156366d31524dc6b88836f06dccb1be13dbef5f1.tar.gz kernel_samsung_smdk4412-156366d31524dc6b88836f06dccb1be13dbef5f1.tar.bz2 kernel_samsung_smdk4412-156366d31524dc6b88836f06dccb1be13dbef5f1.zip | |
Merge remote branch 'alsa/devel' into topic/misc
Conflicts:
sound/usb/usbaudio.c
Diffstat (limited to 'sound/isa/opti9xx/miro.c')
0 files changed, 0 insertions, 0 deletions