Merge branch 'fix/caiaq' into for-linus

Browse source

* fix/caiaq:
  ALSA: usx2y - reparent sound device
  ALSA: snd_usb_caiaq: reparent sound device

...

This commit is contained in:

Takashi Iwai 2009-07-02 17:48:32 +02:00

parent dc8a4f3fc3 3f5d3465be

commit cfbc78003e

3 changed files with 8 additions and 6 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

10

sound/usb/caiaq/device.c

View file

2

sound/usb/usx2y/us122l.c

View file

2

sound/usb/usx2y/usbusx2y.c

View file