projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9161bd0 0725dda)
Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Wed, 5 Nov 2014 14:37:22 +0000 (15:37 +0100)
committerTakashi Iwai <tiwai@suse.de>
Wed, 5 Nov 2014 14:37:22 +0000 (15:37 +0100)
commit19566b0bd93c34e4941822ed3c0d76a5abddcf82
tree7e1894610584133feb4ee6e08bb3e05eb3d6acc1tree | snapshot
parent9161bd0d1cf375492f0a6aa86b3e4c28b070fb7ccommit | diff
parent0725dda207e95ff25f1aa01432250323e0ec49d6commit | 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
sound/usb/card.c diff1 | diff2 | blob | history
John Crispins staging tree