| commit | 19566b0bd93c34e4941822ed3c0d76a5abddcf82 | [log] [tgz] |
|---|---|---|
| author | Takashi Iwai <tiwai@suse.de> | Wed Nov 05 15:37:22 2014 +0100 |
| committer | Takashi Iwai <tiwai@suse.de> | Wed Nov 05 15:37:22 2014 +0100 |
| tree | 7e1894610584133feb4ee6e08bb3e05eb3d6acc1 | |
| parent | 9161bd0d1cf375492f0a6aa86b3e4c28b070fb7c [diff] | |
| parent | 0725dda207e95ff25f1aa01432250323e0ec49d6 [diff] |
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