git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7f9320d
0a566ec
)
Merge remote branch 'alsa/devel' into topic/misc
author
Takashi Iwai
<tiwai@suse.de>
Tue, 2 Mar 2010 10:27:46 +0000
(11:27 +0100)
committer
Takashi Iwai
<tiwai@suse.de>
Tue, 2 Mar 2010 10:27:46 +0000
(11:27 +0100)
Conflicts:
sound/usb/usbaudio.c
Trivial merge