git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
07a9e2b
5b84ba2
)
Merge branch 'topic/workq-update' into topic/asoc
author
Takashi Iwai
<tiwai@suse.de>
Mon, 13 Dec 2010 08:28:43 +0000
(09:28 +0100)
committer
Takashi Iwai
<tiwai@suse.de>
Mon, 13 Dec 2010 08:28:43 +0000
(09:28 +0100)
Conflicts:
sound/soc/codecs/wm8350.c
sound/soc/codecs/wm8753.c
sound/soc/sh/fsi.c
sound/soc/soc-core.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff