git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1962fca
7241ea5
)
Merge branch 'for-linus' into for-next
author
Takashi Iwai
<tiwai@suse.de>
Wed, 29 Apr 2015 05:28:29 +0000
(07:28 +0200)
committer
Takashi Iwai
<tiwai@suse.de>
Wed, 29 Apr 2015 05:28:29 +0000
(07:28 +0200)
Conflicts:
sound/pci/emu10k1/emu10k1_main.c
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff