diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-11-05 15:37:22 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-11-05 15:37:22 +0100 |
| commit | 19566b0bd93c34e4941822ed3c0d76a5abddcf82 (patch) | |
| tree | 7e1894610584133feb4ee6e08bb3e05eb3d6acc1 /drivers/dma-buf | |
| parent | 9161bd0d1cf375492f0a6aa86b3e4c28b070fb7c (diff) | |
| parent | 0725dda207e95ff25f1aa01432250323e0ec49d6 (diff) | |
| download | linux-19566b0bd93c34e4941822ed3c0d76a5abddcf82.tar.bz2 | |
Merge branch 'for-linus' into for-next
This merges the USB-audio disconnect fix and resolves the conflicts
so that we can continue working on development of usb-audio stuff.
Conflicts:
sound/usb/card.c
Diffstat (limited to 'drivers/dma-buf')
0 files changed, 0 insertions, 0 deletions