]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: af3739a a3dea24)
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)
commit541ee57eccad0c7bc5811127eedae179e1d1c48f
tree7e1894610584133feb4ee6e08bb3e05eb3d6acc1tree | snapshot
parentaf3739a5d0f829e38f2ea05d9d206a0291292b13commit | diff
parenta3dea246c6308defb01aa088149e0e5def405505commit | 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
Linux Kernel Source Tree.