git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
18dcd30
250f327
)
Merge branch 'fix/hda' into topic/hda
author
Takashi Iwai
<tiwai@suse.de>
Sat, 7 Apr 2012 10:26:55 +0000
(12:26 +0200)
committer
Takashi Iwai
<tiwai@suse.de>
Sat, 7 Apr 2012 10:26:55 +0000
(12:26 +0200)
Conflicts:
sound/pci/hda/patch_conexant.c
Trivial merge