diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-06-29 18:05:09 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-06-29 18:05:09 +0200 |
| commit | 580c9d373ce7ccfbc5227e985fca761f8f039af3 (patch) | |
| tree | 4de132f09624dd2cafc51fcd3171e41494adef64 /fs/ncpfs/sock.c | |
| parent | Merge branch 'fix/oxygen' into for-linus (diff) | |
| parent | sound: Use PCI_VDEVICE for CREATIVE and ECTIVA (diff) | |
| download | linux-580c9d373ce7ccfbc5227e985fca761f8f039af3.tar.xz linux-580c9d373ce7ccfbc5227e985fca761f8f039af3.zip | |
Merge branch 'fix/pci-vdevice' into for-linus
* fix/pci-vdevice:
sound: Use PCI_VDEVICE for CREATIVE and ECTIVA
sound: Use PCI_VDEVICE
Diffstat (limited to 'fs/ncpfs/sock.c')
0 files changed, 0 insertions, 0 deletions