git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e0299eb
630f2d4
)
Merge branch 'topic/asoc' into for-next
author
Takashi Iwai
<tiwai@suse.de>
Sun, 17 Oct 2010 08:14:41 +0000
(10:14 +0200)
committer
Takashi Iwai
<tiwai@suse.de>
Sun, 17 Oct 2010 08:14:41 +0000
(10:14 +0200)
Conflicts:
arch/powerpc/platforms/85xx/p1022_ds.c
Trivial merge