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 /drivers/base/platform.c | |
| parent | ALSA: sound/usb/caiaq/midi.h: Checkpatch cleanup (diff) | |
| parent | ALSA: ua101: removing debugging code (diff) | |
| download | wireguard-linux-156366d31524dc6b88836f06dccb1be13dbef5f1.tar.xz wireguard-linux-156366d31524dc6b88836f06dccb1be13dbef5f1.zip | |
Merge remote branch 'alsa/devel' into topic/misc
Conflicts:
sound/usb/usbaudio.c
Diffstat (limited to 'drivers/base/platform.c')
0 files changed, 0 insertions, 0 deletions