git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9161bd0
0725dda
)
Merge branch 'for-linus' into for-next
author
Takashi Iwai
<tiwai@suse.de>
Wed, 5 Nov 2014 14:37:22 +0000
(15:37 +0100)
committer
Takashi Iwai
<tiwai@suse.de>
Wed, 5 Nov 2014 14:37:22 +0000
(15:37 +0100)
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
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff