git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
006f367
b1a0aac
)
Merge branch 'topic/snd_card_new-err' into topic/asoc
author
Takashi Iwai
<tiwai@suse.de>
Wed, 28 Jan 2009 07:08:32 +0000
(08:08 +0100)
committer
Takashi Iwai
<tiwai@suse.de>
Wed, 28 Jan 2009 07:08:32 +0000
(08:08 +0100)
Conflicts:
sound/soc/soc-core.c
Trivial merge