git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ed31348
bc4a68f
)
Merge branch 'topic/misc' into topic/pcsp-fix
author
Takashi Iwai
<tiwai@suse.de>
Wed, 26 Nov 2008 13:12:42 +0000
(14:12 +0100)
committer
Takashi Iwai
<tiwai@suse.de>
Wed, 26 Nov 2008 13:12:42 +0000
(14:12 +0100)
Conflicts:
sound/drivers/pcsp/pcsp_lib.c
Trivial merge