git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
19008bd
ad8332c
)
Merge branch 'topic/asoc' into for-linus
author
Takashi Iwai
<tiwai@suse.de>
Thu, 20 May 2010 10:00:43 +0000
(12:00 +0200)
committer
Takashi Iwai
<tiwai@suse.de>
Thu, 20 May 2010 10:00:43 +0000
(12:00 +0200)
Conflicts:
sound/soc/codecs/ad1938.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff